Commit Graph

35873 Commits

Author SHA1 Message Date
Michael Niedermayer
3c7ba39d09 h264: retuen the amount read in case of NAL_END_SEQUENCE
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 227960427b)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:02:26 +01:00
Michael Niedermayer
7c98d284ff h264: reset nal_unit_type so that decoding frames without any nal units
dont leave its value at something random.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 902c090413)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:02:17 +01:00
Michael Niedermayer
c55b158b87 mtvdemuxer: fix segfault caused by truncated packets.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f890cb948c)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:02:00 +01:00
Michael Niedermayer
5ca4ec76b7 lavf: print an error if a packet has been truncated due to filesize
in av_get_packet()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ee181f84a3)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:01:49 +01:00
Michael Niedermayer
813c05fcd2 txd/westwood: remove demuxer specific overallocate solutions as the new generic code
handles it fine.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 207d9eab5a)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:01:40 +01:00
Michael Niedermayer
dd5d2de5ec lavf: Update AVIOContext.maxsize when hitting the end.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 559ae20dda)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:01:30 +01:00
Michael Niedermayer
c40296d1ad avidec: Check that the header chunks fit in the available filesize.
Fixes Ticket771
Bug found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 62adc60b97)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:29:02 +01:00
Michael Niedermayer
cd5d5bf45c txddemux: Limit allocated packets to filesize.
Fixes Ticket772
Bug found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f72601d063)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:28:54 +01:00
Michael Niedermayer
aed8e8f9f3 thp: simplify overallocate checks.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a000975444)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:28:45 +01:00
Michael Niedermayer
349cca9f12 lavf: add internal AVIOContext.maxsize
This allows simple and generic limiting of allocations used for packets.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 47572323f2)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:28:38 +01:00
Michael Niedermayer
58b65c1241 thpdemux: Check that packed sizes are within the files data size and filesize.
Fixes Ticket774
Bug found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 482ee63641)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:28:26 +01:00
Michael Niedermayer
44e7ef15ae avidec: Fix infinite loop caused by rounding of timestamps in non interleaved avis.
Fixes Ticket775
Bug found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e098fba5d9)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:28:15 +01:00
Michael Niedermayer
e7cb6e1c04 j2kdec: Fix integer overflow leading to a segfault
Fixes Ticket776
Bug found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1f99939a63)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:27:59 +01:00
Michael Niedermayer
4af03698f3 smackerdemuxer: check some values before instead of just after malloc()
Fixes Ticket777
Bug Found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c402c1c976)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:27:48 +01:00
Michael Niedermayer
8af76473b3 westwooddemux: dont require avio_size() functionality.
Found by reimar

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e2a16e82b1)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:27:36 +01:00
Carl Eugen Hoyos
7d96f764d6 Fix typo in v210 decoder options.
(cherry picked from commit 56669837ce)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:26:57 +01:00
Michael Niedermayer
b32554175c ffmpeg: check return code from av_vsrc_buffer_add_frame()
Fixed Ticket770
Bug found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1f273c2bf2)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:26:39 +01:00
Michael Niedermayer
134b7f57db smacker: Check for overread in smka_decode_frame()
Fixes a segfault with wetlog_fail.smk
Bug found by: Shitiz Garg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d0f7927177)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:26:09 +01:00
Michael Niedermayer
0177ac9637 lavf: Fix fps misdetection when codec_info_duration is 0 and only a few frames are used to estimate fps.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d19ca77f42)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:25:38 +01:00
Michael Niedermayer
17044e1a2b mov: Fix near infinite loop in stsd parsing.
Fixes Ticket768
Bug found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5f95c130a0)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:25:27 +01:00
Michael Niedermayer
19babec06f westwooddemuxer: use av_get_packet()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 4255d6d96c)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:25:19 +01:00
Michael Niedermayer
02798736bf westwooddemuxer: Fix 1gb alloc
Fixes Ticket765
Bug Found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f68b19fc28)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:25:11 +01:00
Carl Eugen Hoyos
56e2190e10 Fix linesize for bmp with bitdepth < 8.
Fixes ticket #751.
(cherry picked from commit 6f2054c589)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:25:03 +01:00
Michael Niedermayer
54aa78adaa h264: fix midstream extardata handling with dump.f4v
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a4755df523)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:24:36 +01:00
Michael Niedermayer
c575d63ac2 ffmpeg: reset dts/pts after decoding the first subpacket
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6c39b3c278)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:24:04 +01:00
Martin Storsjö
3f1e77a44c flvenc: Support muxing 16 kHz nellymoser
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit bd2ff1a8bc)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:23:17 +01:00
Mans Rullgard
923deca05f v410enc: fix output buffer size check
The encoder clearly needs width * height * 4 bytes.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit dabba0c676)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:22:26 +01:00
Michael Niedermayer
d1f74d838e jpegdec: check return value of mjpeg_decode_dc()
Fixes Ticket754

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 484b1cdd53)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:20:43 +01:00
Michael Niedermayer
07892e33ef h264: Fix build with --disable-everything --enable-decoder='h264' --disable-optimizations
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d998a6ddee)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:20:34 +01:00
Shitiz Garg
0c62a00e68 westwood: Make sure audio header info is present when parsing audio packets
Audio header information might get scrambled and would not parse,
yet wsqva_read_packet would try to parse audio packets causing
segfaults such as floating point exception.

Fixes bugzilla #141.

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 566ee0eaf1)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:19:40 +01:00
Martin Storsjö
1804becb30 libgsm: Reset the MS mode of GSM in the flush function
The mode is set in libgsm_decode_init, but the decoder
object is simply destroyed and recreated in the flush
function - therefore the mode has to be set again.

This fixes playback using the libgsm_ms decoder in avplay.

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 1b35af3225)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:19:22 +01:00
Martin Storsjö
a11c9d7778 libgsm: Set options on the right object
This fixes regressions in decoding using the libgsm_ms decoder,
broken since 0eea212943.

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 8637af8d24)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:18:39 +01:00
Michael Niedermayer
1d23f5bbef h263dec: Fix regression / crash with lowres.
Fixes Ticket757
Bug Found by: ami_stuff

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 21270cffae)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:18:13 +01:00
Michael Niedermayer
c0ff6b6378 flicvideo: input buffer pointer checks.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 30b996d443)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:18:01 +01:00
Michael Niedermayer
6a805e5334 flicvideo: fix overread.
Bug Found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit afb2bac48d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:17:50 +01:00
Michael Niedermayer
6b7a14e599 aacsbr: Fix memory corruption.
Fixes Ticket760 and Ticket761
Bug Found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 944f5b2779)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:17:42 +01:00
Michael Niedermayer
b6c19c9c91 h264: check chroma_format_idc range.
Fixes Ticket758
Bug found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 7fff64e00d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:17:26 +01:00
Michael Niedermayer
e8bd1af095 indeo3: check return values of allocate_frame_buffers()
Bug Found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit cd645c15d8)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:17:07 +01:00
Michael Niedermayer
09453e6bd3 mtv: Fix FPE with 0 dimensions.
Fixes Ticket755
Bug Found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8b9b6332df)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:17:02 +01:00
Martin Storsjö
bf9af661b8 applehttp: Properly clean up if unable to probe a segment
This avoids a segfault if the probe function wasn't able to
determine the format.

The bug was found by Panagiotis H.M. Issaris.

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 115a57302a)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:12:33 +01:00
Martin Storsjö
63d5fa55fe applehttp: Avoid reading uninitialized memory
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit c41b9842ce)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:09:56 +01:00
Carl Eugen Hoyos
d344e45f19 Detect 'yuv2' as rawvideo also in avi.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:09:28 +01:00
Michael Niedermayer
485d088f94 fate: fix v410 on big endian
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0a11e7ffba)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 17:57:50 +01:00
Derek Buitenhuis
84f3bdb8f4 fate: Add FATE tests for v410 encoder and decoder
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 64a0b826e1)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 17:57:43 +01:00
Derek Buitenhuis
93442a27c5 v410 encoder and decoder
v410 is a packed 10-bit 4:4:4 YCbCr format used in
QuickTime.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 309ffa4fe3)

Conflicts:

	libavcodec/version.h

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 17:57:26 +01:00
Michael Niedermayer
bfe7d96ed2 MAINTAINERS: add 0.9
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 635a301683)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 17:56:28 +01:00
Reimar Döffinger
97e6a0fa2a Support "VLB " audio in NSV files.
See samples/nsv/vlb_audio.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
(cherry picked from commit 36be045ed7)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 17:55:05 +01:00
Michael Niedermayer
9e4d30397b decoding example: reset pts/dts after subpacket.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0e187fd13c)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 17:52:37 +01:00
Gaurav Narula
399e5b675b ulti: Fix invalid reads
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit a99273ebf3)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 17:52:21 +01:00
Michael Niedermayer
0a2fbb0a84 msrledec: Check for overreads
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 53be37e368)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 17:51:52 +01:00