[FFmpeg-cvslog] Merge commit 'b9ee5f2cab3ffe1c962e542346b1ed61394864ec'
Michael Niedermayer
git at videolan.org
Sat Feb 9 12:42:52 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Feb 9 12:19:21 2013 +0100| [e5212354eadd4acbdc1bfeeafa5e50eb1ec5c337] | committer: Michael Niedermayer
Merge commit 'b9ee5f2cab3ffe1c962e542346b1ed61394864ec'
* commit 'b9ee5f2cab3ffe1c962e542346b1ed61394864ec':
indeo3: replace use of copy_block4 with put_pixels
mjpegdec: use put_pixels instead of copy_block8
Conflicts:
libavcodec/mjpegdec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e5212354eadd4acbdc1bfeeafa5e50eb1ec5c337
---
More information about the ffmpeg-cvslog
mailing list