[FFmpeg-cvslog] Merge commit '054013a0fc6f2b52c60cee3e051be8cc7f82cef3'
Michael Niedermayer
git at videolan.org
Fri May 30 01:20:52 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May 30 00:59:15 2014 +0200| [40f3a87c10d5773eb66e09f4ed3d8197b1840863] | committer: Michael Niedermayer
Merge commit '054013a0fc6f2b52c60cee3e051be8cc7f82cef3'
* commit '054013a0fc6f2b52c60cee3e051be8cc7f82cef3':
dsputil: Move APE-specific bits into apedsp
Conflicts:
libavcodec/arm/int_neon.S
libavcodec/x86/dsputil.asm
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=40f3a87c10d5773eb66e09f4ed3d8197b1840863
---
More information about the ffmpeg-cvslog
mailing list