[FFmpeg-cvslog] Merge commit '95baf701db719ecad6b31000429e20eca2526ed6'
Michael Niedermayer
git at videolan.org
Thu Dec 13 11:52:41 CET 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Dec 13 11:38:52 2012 +0100| [e7f255d89b587ce78b17d1bd45521d21ff10822b] | committer: Michael Niedermayer
Merge commit '95baf701db719ecad6b31000429e20eca2526ed6'
* commit '95baf701db719ecad6b31000429e20eca2526ed6':
svq1: deMpegEncContextize
Conflicts:
libavcodec/svq1dec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e7f255d89b587ce78b17d1bd45521d21ff10822b
---
More information about the ffmpeg-cvslog
mailing list