[FFmpeg-cvslog] Merge commit 'c51a3a5bd9a5b404176ff343ecadb80b2553b256'
Michael Niedermayer
git at videolan.org
Fri Apr 12 22:41:38 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr 12 22:36:31 2013 +0200| [694fa0035af5befaa3bbbfc500434877895e2e36] | committer: Michael Niedermayer
Merge commit 'c51a3a5bd9a5b404176ff343ecadb80b2553b256'
* commit 'c51a3a5bd9a5b404176ff343ecadb80b2553b256':
x86: dsputil: Refactor some ff_{avg|put}_pixels function declarations
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=694fa0035af5befaa3bbbfc500434877895e2e36
---
More information about the ffmpeg-cvslog
mailing list