Merge commit '38282149b6ce8f4b8361e3b84542ba9aa8a1f32f'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 1 May 2013 16:08:13 +0000 (18:08 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 1 May 2013 16:08:13 +0000 (18:08 +0200)
commitcae8f469fee7c32685f04a2b507251119d6875ef
tree1f0ca385d3ab050c391736551a370184a24dcbf0
parentebd99ff112e8993330dd39959c22dfe1ab17d5c0
parent38282149b6ce8f4b8361e3b84542ba9aa8a1f32f
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>
20 files changed:
libavcodec/fft.c
libavcodec/fft.h
libavcodec/fmtconvert.c
libavcodec/fmtconvert.h
libavcodec/h264dsp.c
libavcodec/mpegaudiodsp.c
libavcodec/mpegaudiodsp.h
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/ppc/fft_altivec.c
libavcodec/ppc/fmtconvert_altivec.c
libavcodec/ppc/h264dsp.c
libavcodec/ppc/mpegaudiodsp_altivec.c
libavcodec/ppc/mpegvideo_altivec.c
libavcodec/ppc/vc1dsp_altivec.c
libavcodec/ppc/vp8dsp_altivec.c
libavcodec/vc1dsp.c
libavcodec/vc1dsp.h
libavcodec/vp8dsp.c
libavcodec/vp8dsp.h