Michael Niedermayer cae8f469fe Merge commit '38282149b6ce8f4b8361e3b84542ba9aa8a1f32f' ...

* commit '38282149b6ce8f4b8361e3b84542ba9aa8a1f32f':
  ppc: More consistent arch initialization

Conflicts:
	libavcodec/fft.h
	libavcodec/mpegaudiodsp.c
	libavcodec/mpegaudiodsp.h

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

2013-05-01 18:08:13 +02:00

30 KiB

Raw Blame History

View Raw