generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
36,542 Commits 24 Branches 241 Tags 173 MiB
877f6eb5fb
Commit Graph

3 Commits

Author SHA1 Message Date
Michael Niedermayer
6071e4d87a 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>
 2011-12-29 01:40:34 +01:00
Paul B Mahol
b5aecc6bc0 avformat: Add SMJPEG demuxer. 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-12-28 20:17:20 +01:00
Paul B Mahol
a4209ad631 lavf: Add SMJPEG demuxer. 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-22 04:12:45 +01:00