highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,587 Commits 36 Branches 392 Tags
Commit Graph

31587 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Aimar
60a1384013 Avoid NULL dereference on corrupted bitstream with real decoder. 
rv34_decode_slice() can return without allocating any pictures.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 140dbcff357351570426efd0e0bc00e380f5436e)
 2011-09-21 20:56:53 +02:00
Laurent Aimar
b59919afe2 Reject slices that does not have the same type than the first one in RV10/RV20 decoder. 
This prevents crashes with some corrupted bitstreams.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d788af6cf696d547a442c47e1ce6f93bc9fc97b6)
 2011-09-21 20:56:53 +02:00
Michael Niedermayer
764ffdd0ec check all svq3_get_ue_golomb() returns. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 979bea13003ef489d95d2538ac2fb1c26c6f103b)
 2011-09-21 20:56:53 +02:00
Michael Niedermayer
ed9e561490 rv34: check for size mismatch 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 35f38b3ab9d755aede5bce8abbe1cb9c07027f8a)
 2011-09-21 20:56:53 +02:00
Laurent Aimar
24e0a9e451 Reject audio tracks with invalid interleaver parameters in RM demuxer. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 4907f813581acd6cf68f1be9eb163464503e8208)
 2011-09-21 19:50:13 +02:00
Laurent Aimar
4d8330d095 Fix js_vlc_bits value validation when joint stereo is used in cook decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 352c878de6fca57a3f2a6369e27ca442fa5f9518)
 2011-09-21 19:50:08 +02:00
Laurent Aimar
30d7dce94f Fix potential overreads in rv34 decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 9a0a64cb26bc6aaa7f29106bded8a27f3db918ee)
 2011-09-21 19:50:03 +02:00
Ingo Brückl
6e21f03547 Correct determination of file size and frames in VBRI headers 
The fields "Number of Bytes" and "Number of Frames" are mixed up. "Bytes"
come first, "Frames" behind.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5d305c9398c043f9ae3bbc6d64a3e1dc468c1e63)
 2011-09-21 19:49:52 +02:00
Michael Niedermayer
fa3f7391be h264: allow disabling bitstream overread protection by using the fast flag. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 205c13685f36a17f406b7cd07e14b6d2a61f396a)
 2011-09-21 19:49:30 +02:00
Alex Converse
b7000d0517 xan: Add some buffer checks 
(cherry picked from commit 0872bb23b4bd2d94a8ba91070f706d1bc1c3ced8)
 2011-09-21 19:47:12 +02:00
Alex Converse
169e634457 xan: Remove extra trailing newline 
(cherry picked from commit 350f57bd7b77b36c150540ad2aae9de42cc4dfca)
 2011-09-21 19:47:06 +02:00
Laurent Aimar
053bc4ce8b Fixed size given to init_get_bits() in xan decoder. 
(cherry picked from commit 393d5031c6aaaf8c2dda4eb5d676974c349fae85)
 2011-09-21 19:47:00 +02:00
Michael Niedermayer
56634b2328 libavformat/utils: print ts in the "invalid dts/pts combination" case. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 38670356f990da1efb906232768836d83356855b)
 2011-09-21 19:46:50 +02:00
Michael Niedermayer
1072498081 vf_remove_logo: domt access vf->next->query_format() directly but use the API. 
This fixes a crash

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 39e0accb7a934bfe3d42324b016dd8790790746d)
 2011-09-21 19:46:42 +02:00
Michael Niedermayer
e952ff6981 smacker: fix a few off by 1 errors 
stereo & 16bit is untested due to lack of samples

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d67e74929c2c0d09383c2f4a9c904bfdd839c67c)
 2011-09-21 19:46:34 +02:00
Michael Niedermayer
9cee26dfde smacker: add forgotten * 
found by fenrir

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f98edc73c599badaa0c075fbffb519a150d03d80)
 2011-09-21 19:46:23 +02:00
Laurent Aimar
605f89ffc9 segafilm: Fix potential division by 0 on corrupted segafilm streams in the demuxer. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-21 19:44:41 +02:00
Laurent Aimar
21587509ec segafilm: Check for memory allocation failures in segafilm demuxer. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 7cbe02575868e7d25acf3d319ece664702700f0a)
 2011-09-21 19:36:58 +02:00
Kostya Shishkov
ad6177e52c rv34: check that subsequent slices have the same type as first one. 
This prevents some crashes when corrupted bitstream reports e.g. P-type
slice in I-frame. Official RealVideo decoder demands all slices to be
of the same type too.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 23a1f0c59241465ba30103388029a7afc0ead909)
 2011-09-21 19:36:53 +02:00
Kostya Shishkov
b1ceca016a smacker demuxer: handle possible av_realloc() failure. 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-09-21 19:34:25 +02:00
Hendrik Leppkes
85b1e265c9 gitignore: ignore .exp files, as generated by the MS linker on win32 
Ignore another filetype, as generated by Microsofts lib.exe when creating the import libraries.
(cherry picked from commit 73211630110886d849e3de837ca80280a2df2b46)
 2011-09-21 18:04:31 +02:00
Joakim Plate
8449cebc90 rmdec: Check return value of more avio_seek calls 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 7e4111cfe2f5d03af8d608757e897145aa252af8)
 2011-09-21 18:03:16 +02:00
Joakim Plate
4a721b18ed avidec: Check return value of more avio_seek calls 
The move of avio_seek in avi_read_seek is to avoiding modifying
state if the seek would fail.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f9e083a156f19094cb6fcd134c1ca4ca899a1a6d)
 2011-09-21 18:03:11 +02:00
Joakim Plate
f0869d3721 asf: Check return value of more avio_seek calls 
This reduces problems when underlying protocol is not
seekable even if marked as such or if the file has been
cut short.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ac1d489320f476c18d6a8125f73389aecb73f3d3)
 2011-09-21 18:03:05 +02:00
Laurent Aimar
be82df9e12 Fix writes out of bounds in the ogg demuxer. 
Between ogg_save() and ogg_restore() calls, the number of streams
could have been reduced.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit bc851a2946c64eefb96145b70e2190ff7d5a4827)
 2011-09-21 18:03:01 +02:00
Luca Barbato
b70a37f854 doc: explain __STDC_CONSTANT_MACROS in C++ 
In order to build C++ programs using libav you need
-D__STDC_CONSTANT_MACROS appened to the CXXFLAGS.
(cherry picked from commit d162994a81a311a8dd212a50a2d2ad2b088df97f)
 2011-09-21 18:02:54 +02:00
Joakim Plate
812a4a5813 gitignore: add files to git ignore generated on a win32 build 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5a6f4a130226e04e0db3bd7c7c1ff76fe3f06080)
 2011-09-21 18:02:46 +02:00
Laurent Aimar
c9316b7c6d Fixed invalid read access on extra data in cinepak decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit dc255275f6293a060518271a151e1ce75499e874)
 2011-09-21 18:02:40 +02:00
Laurent Aimar
8511c141e0 Fixed segfault on corrupted smacker streams in the demuxer. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d0121e8d969cde74fa7dbd96d3602109b051e701)
 2011-09-21 18:02:34 +02:00
Laurent Aimar
2bf9a09a2c Fixed segfaults on corruped smacker streams in the decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d07ac1853da29ea696243160e02154ebf758d1ee)
 2011-09-21 18:02:29 +02:00
Laurent Aimar
4601765ee8 Fixed segfault on memory allocation failure in ape demuxer. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1632a576e68c27229b31f0d1203ff90220e0e024)
 2011-09-21 18:02:25 +02:00
Michael Niedermayer
54544100a3 h264: prevent an out of array read in decode_nal_units() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ea0ac11e52b9cf5264f3d4eb7543e760c2a5fbb4)
 2011-09-21 18:02:18 +02:00
Michael Niedermayer
97437dada6 h264dec: Prevent CABAC and CAVLC bitsteram overreading 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 23f5cff92cdcfa55a735c458fcb5f95c0e0f3b1f)
 2011-09-21 18:02:13 +02:00
Art Clarke
c8736de331 libspeex encoder wraper 
taken from svn head of xuggle
(cherry picked from commit a52cdcd296c40882c3b4f88958990c56f0ce3019)
 2011-09-21 18:01:25 +02:00
Joakim Plate
92f1b5df32 dvbsubdec: don't hardcode subtitle colors count in dvbsubdec to 16 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 4a3294ef0069c898a495c783dfdb2f0bf1dc6583)
 2011-09-21 18:01:20 +02:00
Laurent Aimar
82e4fd193f Fixed segfault with wavpack decoder on corrupted decorrelation terms sub-blocks. 
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 8bfea4ab4e2cb32bc7bf6f697ee30a238c65d296)
 2011-09-21 18:01:13 +02:00
Alex Converse
3a0649ddeb cljr: init_get_bits size in bits instead of bytes 
(cherry picked from commit 0c1f5b93d9b97c4cc3684ba91a040e90bfc760d2)
 2011-09-21 18:01:09 +02:00
Alex Converse
9f05400ea8 indeo2: fail if input buffer too small 
(cherry picked from commit b7ce4f1d1c3add86ece7ca595ea6c4a10b471055)
 2011-09-21 18:01:02 +02:00
Alex Converse
09cfd6f597 indeo2: init_get_bits size in bits instead of bytes 
(cherry picked from commit 68ca330cbd479111db9cb7649d7530ad59f04cc8)
 2011-09-21 18:00:54 +02:00
Michael Niedermayer
b2af83a9ed cabac test: Change input to test, so a wider range of states is tested. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1eb805ed70a0aac35523c7a308145b6b8d05441e)
 2011-09-21 18:00:40 +02:00
Michael Niedermayer
f38b2a6be8 cabac test: match encode and decode side 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 830d7d5c4fbf81265ca5260d59fe8467ac97b2e6)
 2011-09-21 18:00:36 +02:00
Michael Niedermayer
db93a5a0c8 cabac: fix cabac encoder 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 89653ea728bd59da2b88967ad648cce685950879)
 2011-09-21 18:00:18 +02:00
Laurent Aimar
b5fe6bee01 Fixed deference of NULL pointer in motionpixels decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 824f98f442996eaee9204b132752cf5114fc94cf)
 2011-09-21 18:00:10 +02:00
chinshou
57571f348e avisynth: Fix upside down bug 
(cherry picked from commit b10ba1175d3afa28d88cf3b24b69dc4882be16f5)
 2011-09-21 18:00:04 +02:00
chinshou
ab2ea6415b avisynth: Remove wrong pts calculation. 
Fixes Ticket428
(cherry picked from commit 4f123a7d7c8cbf425958e726689c6bdc84605e91)
 2011-09-21 17:59:57 +02:00
Laurent Aimar
7181adab80 Fixed size given to init_get_bits(). 
init_get_bits() takes a number of bits and not a number of bytes as
its size argument.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e5e0580b93a5bda34f62a5df50c1b15e610d4ad1)
 2011-09-21 17:59:48 +02:00
Laurent Aimar
bac822025e Fixed size given to init_get_bits() in ffv1 decoder. 
init_get_bits() takes a number of bits and not a number of bytes as
its size argument.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8362a0ffed0b15a9977fcde947bcb49dfc06638b)
 2011-09-21 17:59:43 +02:00
Alex Converse
8a8aafd2b9 wavpack: Check error codes rather than working around error conditions. 
(cherry picked from commit dba2b63a98bdcac7bda1a8a2c48950518c075e17)
 2011-09-21 17:59:36 +02:00
Michael Niedermayer
a13ef61051 rc: finetune convergence failure fix 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 73e0ec2ff453799e361c67395b93df11986609b3)
 2011-09-21 17:59:30 +02:00
Michael Niedermayer
4fbc35cd53 rc: fix convergence failure 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ed14517c234299387d401959c6037f25e0937f02)
 2011-09-21 17:59:25 +02:00