[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'
Michael Niedermayer
git at videolan.org
Thu Dec 29 02:01:06 CET 2011
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Dec 29 01:40:34 2011 +0100| [6071e4d87a9b257c3f7b5912825ede9caa757624] | committer: Michael Niedermayer
Merge remote-tracking branch 'qatar/master'
* qatar/master:
v410dec: Check for sufficient input data. Fixes crash
fate: Add v210 codec regression tests
mpegts: adjustable minimum PES payload
mpegts: properly output large audio packets
avformat: Add SMJPEG demuxer.
Indeo 4 decoder
Conflicts:
doc/general.texi
libavcodec/v410dec.c
libavcodec/version.h
libavformat/mpegtsenc.c
libavformat/smjpeg.c
libavformat/version.h
tests/codec-regression.sh
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6071e4d87a9b257c3f7b5912825ede9caa757624
---
More information about the ffmpeg-cvslog
mailing list