[FFmpeg-cvslog] Merge commit 'bda9e6d923df6d46cc5cafb30a59a01d2514fa61'
Michael Niedermayer
git at videolan.org
Wed May 1 10:00:40 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 1 09:51:37 2013 +0200| [d8b6557c866d268745123cbdd6e5431ed9261b96] | committer: Michael Niedermayer
Merge commit 'bda9e6d923df6d46cc5cafb30a59a01d2514fa61'
* commit 'bda9e6d923df6d46cc5cafb30a59a01d2514fa61':
indeo3: use put_pixels instead of put_no_rnd_pixels in copy_cell()
Conflicts:
libavcodec/indeo3.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d8b6557c866d268745123cbdd6e5431ed9261b96
---
More information about the ffmpeg-cvslog
mailing list