Michael Niedermayer 477641e9f8 Merge commit 'a64f6a04ac5773aeff2003897455dadb9609f18b' ...

* commit 'a64f6a04ac5773aeff2003897455dadb9609f18b':
  dsputil: x86: Hide arch-specific initialization details

Conflicts:
	libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-08-29 14:32:05 +02:00

98 KiB

Raw Blame History

View Raw