35950 Commits

Author SHA1 Message Date
Michael Niedermayer
0815a2907a rl2demux: Fix FPE
Fixes Ticket788
Bug found by Oana Stratulat

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:49:55 +01:00
Paul B. Mahol
d1e1674f66 cljr: fix buf_size sanity check
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
(cherry picked from commit 2e7905eee8d0f8813e703cacdd7b3ffdc4960656)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:49:55 +01:00
Michael Niedermayer
21ca96049f siff: Fix excessive memory allocation.
Bug found by: Oana Stratulat

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:49:55 +01:00
Michael Niedermayer
9f1dde03d5 mov: detect EOF in mov_read_dref()
This fixes a (near) infinite loop and Ticket783
Bug found by: cosminamironesei

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:49:55 +01:00
Michael Niedermayer
d0269db8e3 adx_parser: rewrite.
The previous code ended in multiple different infinite
loops. See stl_ten_1_big.sfd as example with and without zzuf

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:49:55 +01:00
Michael Niedermayer
cb42ed171d adxdec: Fix division by zero
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6b6b84ae1625ce1e38ff5f1b4c0bf03450066e66)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:49:55 +01:00
Michael Niedermayer
2bbda9872f adxdec: Do not require extradata.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit bdd62a615a74ba7d29b528263462937da132c62c)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:49:55 +01:00
Michael Niedermayer
9dd420ede1 adx_parser: Fix infinite loop.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3bf1d787b58cf268f3c055d6f2509fd75258450b)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:49:55 +01:00
Carl Eugen Hoyos
a1974d1ea0 Assume architecture arm for machine hardware name iPad*.
uname -m returns for example "iPad2,1".
(cherry picked from commit b6b00675112b411fbb10e8b01be1d3ddc2574cf9)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:15:27 +01:00
Carl Eugen Hoyos
bf58e5422d Fix possible endless loop when decoding amr.
Fixes bug 151.

Reviewed-by: Vitor Sessak
(cherry picked from commit 290e7eb77bee5a54182fb3d5fb122c1e117190da)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:10:33 +01:00
Michael Niedermayer
88eaab2827 motion_est: avoid generating motion vectors that point between widthxheight and mb_widthxmb_height.
No difference in PSNR or bitrate in the printed precission with the matrix lobby scene at 322x242

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:09:45 +01:00
Michael Niedermayer
0c72d64160 lagarith: rgb24 support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0db7b30700118d9d4b3ce0de8b1da94de747669e)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:09:20 +01:00
Michael Niedermayer
1bb565360c msvideo1enc: Check that dimensions are a multiple of 4.
Fixes Ticket784
Found by: ami_stuff

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:08:44 +01:00
Shitiz Garg
1acf921d6f adpcm: Check for channels to be a non-zero integer
channels would be 0 sometimes and would cause floating point exception
Fixes bugzilla #124

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
(cherry picked from commit e614fac2e6e185a247d722d4e92368b3c3bc4bdb)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:07:30 +01:00
Michael Niedermayer
7bf3f79502 lavc: Check codec_ids against insertion/removial typos
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 83b46713f0941f468f20a149be206db1f78eb944)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:05:38 +01:00
Michael Niedermayer
e3316723b6 avutil: check sampleformats enum, pict type enum and media type enum against insert/remove mistakes.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 75f2cc5134b884dd2088d7b16d6d33a46ecee02a)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:05:32 +01:00
Michael Niedermayer
17d82125c5 pixfmts: Selfcheck against insertions / deletions in the enum.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 68230eb3753f7496c4ba13e727dd48a5997eb23c)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:05:23 +01:00
Michael Niedermayer
513b0f4872 aacdec: Fix null pointer crash
Fixes bug170
Bug found by: Gautam Gupta

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:05:12 +01:00
Michael Niedermayer
cb2d66a470 avienc: Fix rawvideo 32bit
Bug found by: Rik Maes <rik.maes54@gmail.com>
Change based on suggestion by Rik Maes

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:04:56 +01:00
Michael Niedermayer
8c2fe23b1c atrac3: Fix crash in tonal component decoding.
Fixes Ticket780
Bug Found by: cosminamironesei

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:04:45 +01:00
Derek Buitenhuis
c2aa7b70d4 wavpack: Fix 32-bit clipping
In the case that (frame_flags & 0x03) == 3, hybrid_maxclip
may have had a signed integer overflow.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit bb9747c8eee134f2bf6058d368f8cbc799f4b7d3)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:04:14 +01:00
Derek Buitenhuis
8d055e9079 wavpack: Clip samples after shifting
It doesn't make much sense to clip pre-shift,
nor is it correct for proper decoding.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 365e1ec26d7e89a951ebd7851214f59f4aefdec0)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:04:11 +01:00
Michael Niedermayer
4f23f24e30 CODEC_ID_SOL_DPCM: Fix used write buffer.
Bug found by: Oana Stratulat

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:03:39 +01:00
Shitiz Garg
34cee5bd37 cljr: Check if width or height are positive integers
width and height might get passed as 0 and would cause floating point
exceptions in decode_frame.
Fixes bugzilla #149

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:03:05 +01:00
Michael Niedermayer
95234da75e ffmpeg: Fix killing [Y/n] prompt with ctrl-c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 7b92863f30b1a748dc17bf662379261b42751f86)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:02:52 +01:00
Michael Niedermayer
cb7579ae6f ffmpeg: exit() on repeated ctrl-c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit cf7076ee9685d1ae35f2838904574e8aba3b067d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:02:43 +01:00
Michael Niedermayer
5341734b03 h264: return the consumed amountg in case of Q264
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3d07e0aba0c9c29ed17a1becfae61b8b58f46cd1)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:02:32 +01:00
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 227960427b726eaa6c83702e3d49679754cbc322)

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 902c0904139b532ae25113fb6e34fa4c5cdf7ebc)

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 f890cb948c932e3b01f9a616ff1600769c539853)

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 ee181f84a31d5ba3efd28bd635f249cc5240f5a8)

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 207d9eab5a47c54173a3a3cbe990aa746fe6e39a)

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 559ae20dda9e84abf878ee10f8dcea78dacfd0cc)

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 62adc60b97d854507d07a21b2f370ab5c69e6b7b)

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 f72601d06378494b5026b919fcd3eb5eb22799a1)

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 a0009754442b339dd6f07f8fe4f803f272866912)

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 47572323f2f908913b4d031af733047d481fb1f6)

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 482ee63641f4fa50f017538af384aadbceee7a18)

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 e098fba5d9c9d52aaddd83e63dd910ff20b841d2)

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 1f99939a6361e2e6d6788494dd7c682b051c6c34)

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 c402c1c976dc5bd63908d1aaff5b60521cbbee92)

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 e2a16e82b13d5dbf7567a4acf44619057f19eb9d)

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 56669837ce18d15d757a144712a082b9cb535c94)

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 1f273c2bf22c49e5f668debf52c497dabee636c7)

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 d0f7927177077799abe540f9195b5ce1fc089183)

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 d19ca77f42080e7b9a360aee65218724c52e08ae)

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 5f95c130a020ec8f6eb7ade8808f59dac5834410)

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 4255d6d96cb80fd411c858d424626f60b97f52ac)

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 f68b19fc28df0a15fa6134726954365d70dec74f)

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 6f2054c589a467b7eaa0c4383c29fcced1280265)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:25:03 +01:00