[FFmpeg-cvslog] Merge commit '831a1180785a786272cdcefb71566a770bfb879e'
Michael Niedermayer
git at videolan.org
Fri Mar 14 00:07:45 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 13 23:59:56 2014 +0100| [1c788eaca9a0ad398d1b6ecc3797949ca84b42f9] | committer: Michael Niedermayer
Merge commit '831a1180785a786272cdcefb71566a770bfb879e'
* commit '831a1180785a786272cdcefb71566a770bfb879e':
Update dsputil- and SIMD-related comments to match reality more closely
Conflicts:
libavcodec/x86/hpeldsp.asm
libavutil/arm/float_dsp_init_arm.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1c788eaca9a0ad398d1b6ecc3797949ca84b42f9
---
More information about the ffmpeg-cvslog
mailing list