[FFmpeg-cvslog] Merge commit '238614de679a71970c20d7c3fee08a322967ec40'
Michael Niedermayer
git at videolan.org
Wed Feb 6 14:59:56 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb 6 14:53:49 2013 +0100| [6e9f3f3b6522a8c1440bab66c8a2d85791fd12f7] | committer: Michael Niedermayer
Merge commit '238614de679a71970c20d7c3fee08a322967ec40'
* commit '238614de679a71970c20d7c3fee08a322967ec40':
cdgraphics: do not rely on get_buffer() initializing the frame.
svq1: replace struct svq1_frame_size with an array.
vf_yadif: silence a warning.
Conflicts:
libavcodec/svq1dec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6e9f3f3b6522a8c1440bab66c8a2d85791fd12f7
---
More information about the ffmpeg-cvslog
mailing list