[FFmpeg-cvslog] Merge commit '1d0feb5d1ac04d187b335f0e8d411c9f40b3a885'
Michael Niedermayer
git at videolan.org
Sat Feb 16 19:10:04 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Feb 16 19:00:39 2013 +0100| [ddbbfd95bee4105fcb75f3b7c039b6c08efe36b4] | committer: Michael Niedermayer
Merge commit '1d0feb5d1ac04d187b335f0e8d411c9f40b3a885'
* commit '1d0feb5d1ac04d187b335f0e8d411c9f40b3a885':
mpegvideo: split ff_draw_horiz_band().
Conflicts:
libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ddbbfd95bee4105fcb75f3b7c039b6c08efe36b4
---
More information about the ffmpeg-cvslog
mailing list