[FFmpeg-cvslog] Merge commit '19cac8e301419dcde31526d15196a952ddf2c4c7'
Michael Niedermayer
git at videolan.org
Wed Mar 13 13:03:38 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 13 12:56:43 2013 +0100| [f45fdb123f39bf7341731aa2e381d7f0f623db70] | committer: Michael Niedermayer
Merge commit '19cac8e301419dcde31526d15196a952ddf2c4c7'
* commit '19cac8e301419dcde31526d15196a952ddf2c4c7':
mpegvideo: remove useless references to h264 and svq3
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f45fdb123f39bf7341731aa2e381d7f0f623db70
---
More information about the ffmpeg-cvslog
mailing list