Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Dec 2011 00:40:34 +0000 (01:40 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Dec 2011 00:40:34 +0000 (01:40 +0100)
commit6071e4d87a9b257c3f7b5912825ede9caa757624
treeaeaad3a1d7eb0b27f20a66665740d2a96e99f7c2
parent7e5cbb3c2d96c27d526aa69cbdbd1ab23739d7e5
parent8f5216905f88510c9a74cd91a424902aa989b9a1
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@gmx.at>
12 files changed:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/ivi_dsp.c
libavcodec/ivi_dsp.h
libavcodec/v410dec.c
libavcodec/version.h
libavformat/mpegtsenc.c
libavformat/smjpeg.c
libavformat/version.h
tests/codec-regression.sh