[FFmpeg-cvslog] Merge commit '38282149b6ce8f4b8361e3b84542ba9aa8a1f32f'
Michael Niedermayer
git at videolan.org
Wed May 1 18:11:22 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 1 18:08:13 2013 +0200| [cae8f469fee7c32685f04a2b507251119d6875ef] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cae8f469fee7c32685f04a2b507251119d6875ef
---
More information about the ffmpeg-cvslog
mailing list