[FFmpeg-cvslog] Merge commit '32ff6432284f713e9f837ee5b36fc8e9f1902836'
Michael Niedermayer
git at videolan.org
Wed Jan 23 17:57:34 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jan 23 17:52:21 2013 +0100| [6d1e9d993a5559ca5c4a578fce499c74528fe8d1] | committer: Michael Niedermayer
Merge commit '32ff6432284f713e9f837ee5b36fc8e9f1902836'
* commit '32ff6432284f713e9f837ee5b36fc8e9f1902836':
dsputil: remove avg_no_rnd_pixels8.
Conflicts:
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6d1e9d993a5559ca5c4a578fce499c74528fe8d1
---
More information about the ffmpeg-cvslog
mailing list