[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Geek.Song]

Dear：

It seems that "mpegts: properly output large audio packets" is not
merged properly.

Does it do intentionally?

On Thu, Dec 29, 2011 at 9:01 AM, Michael Niedermayer <git at videolan.org> wrote:
> 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>
>

-----------------------------------------------------------------------------------------
My key fingerprint: d1:03:f5:32:26:ff:d7:3c:e4:42:e3:51:ec:92:78:b2