Michael Niedermayer
bc1e72c38e
lavf: move force_codec_ids() up
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3a6b6f425e
2013-01-02 02:20:53 +01:00
Clément Bœsch
20c121c007
lavc/ass_split: check for NULL pointer in ff_ass_split_override_codes().
...
This is consistent with the other ff_ass_split_* functions.
It also fixes a crash when trying to split a dialog with text=NULL
(which seems to happen when the text of the dialog is empty); basically,
this commit fixes crashes when trying to encode an empty text subtitle
dialog (see subrip and mov_text encoders).
Fixes Ticket2048.
(cherry picked from commit c83002a4f8
2013-01-01 18:37:10 +01:00
Hendrik Leppkes
5f95b300c1
mov: fix parsing of the chap atom.
...
This was broken in 0d96ec19eb#2081 .
(cherry picked from commit 765158dd82
2013-01-01 17:36:26 +01:00
Clément Bœsch
68e48ed72e
lavc/movtextdec: keep the min size instead of max to fix overread.
...
Fixes Ticket #2087 .
(cherry picked from commit 7d66bc7920
2013-01-01 17:23:43 +01:00
Michael Niedermayer
97ec20a20a
mov: fix time types related to mov_metadata_creation_time
...
Fixes Ticket1817
Based on patch by: Przemyslaw Wesolek <przemyslaw.wesolek@go.art.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit adbb75dbd8
2012-12-20 12:00:38 +01:00
Michael Niedermayer
553c9c77cc
mpeg1video: fix regression with slices != threads
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a01679586c
2012-12-13 00:15:52 +01:00
Michael Niedermayer
f44c73f5bb
mpeg1video: support multi threaded slice encoding.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 03df972016
2012-12-13 00:15:12 +01:00
Michael Chinen
59d765e30c
flac_parser.c: fix issue with looping output for small files.
...
see trac 1345
https://ffmpeg.org/trac/ffmpeg/ticket/1345
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c73b1a1d80
2012-12-11 00:50:19 +01:00
Michael Niedermayer
dad5b9560a
ffplay: Prevent 0/0 aspect from being passed on to lavfi
...
0/0 fails to be parsed
Fixes Ticket1814
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a63d7213b3
2012-12-11 00:49:26 +01:00
Michael Niedermayer
41bcde6021
asfdec: check stream_index for validity
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b7280cff9a
2012-12-10 23:57:14 +01:00
Michael Niedermayer
e432bd071c
asfdec: flip the interpretation of the header aspect back
...
This reverts 2de8877689e5927910c2
2012-12-10 23:57:14 +01:00
Michael Niedermayer
08d75bf545
asfdec: parse aspect ratio payload extension
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 343c73e252
2012-12-10 23:57:14 +01:00
Michael Niedermayer
19de5478f0
asfdec: correctly parse payload extensions
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8c93269e42
2012-12-10 23:57:14 +01:00
Michael Niedermayer
3ac97550ce
asfdec: parse payload extension list
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 2d8c76eb1f
2012-12-10 23:57:14 +01:00
Carl Eugen Hoyos
a875a9a833
vqavideo: Reinitialise the actually used partial codebook bytestream-reader.
...
Fixes ticket #1942 .
(cherry picked from commit dd6abc921a
2012-12-10 01:09:08 +01:00
Michael Niedermayer
73487f7dee
avidec: try to support oddly muxed MMES stream
...
Fixes ticket1804
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit be89693ddc
2012-12-10 01:06:57 +01:00
Michael Niedermayer
c389ae543a
riff: ignore ff_read_riff_info() failure.
...
Some files simply contain invalid info tags.
Fixes unrelated bug posted into Ticket1821
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 09456d0df1
2012-12-10 00:36:58 +01:00
Michael Niedermayer
15526ac69f
riff: retry reading metadata without padding if it fails with
...
Fixes Ticket1821
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d0c27e88d2
2012-12-10 00:36:41 +01:00
Michael Niedermayer
9929991da7
ffserver: set oformat
...
Fix Ticket1986
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit cbe43e62c9
2012-12-10 00:26:56 +01:00
KO Myung-Hun
1b0c1df3b9
lavc: include os2threads.h in vp8.h if HAVE_OS2THREADS is enabled
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3a45688abc
2012-12-08 19:52:03 +01:00
Janne Grunau
e31ace670e
h264: slice-mt: get last_pic_dropable from master context
...
Fixes fate-h264-conformance-cvnlfi2_sony_h and smllwebdl.mkv from
https://github.com/OpenELEC/OpenELEC.tv/issues/1557 .
(cherry picked from commit 24c62ea7a5
2012-12-06 16:52:35 +01:00
Nicolas George
e74cd2f470
lavf: compute probe buffer size more reliably.
...
The previous code computes the offset by reversing the growth
of the allocated buffer size: it is complex and did lead to
inconsistencies when the size limit is reached.
Fix trac ticket #1991 .
(cherry picked from commit 03847eb825
2012-12-05 01:31:50 +01:00
Michael Niedermayer
528700dd58
update for 1.0.1
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-03 21:31:18 +01:00
Michael Niedermayer
e34369e8ec
qdm2: check array index before use, fix out of array accesses
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a7ee6281f7
2012-12-03 21:03:14 +01:00
Michael Niedermayer
74241de7ed
huffyuvdec: check width more completely, avoid out of array accesses
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6abb9a901f
2012-12-03 21:03:14 +01:00
Michael Niedermayer
38e8f78c04
roqvideodec: check dimensions validity
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3ae6104511
2012-12-03 20:45:45 +01:00
Michael Niedermayer
c82d6e05da
h264: correct ref count check and limit, fix out of array accesses.
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d6c184880e
2012-12-03 20:45:41 +01:00
Michael Niedermayer
c8833a13cf
eamad: fix out of array accesses
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 63ac64864c
2012-12-03 20:45:37 +01:00
Michael Niedermayer
28bf685bfc
pgssubdec: check RLE size before copying. Fix out of array accesses
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c0d68be555
2012-12-03 20:45:32 +01:00
Michael Niedermayer
c51c5f83c1
wavpack: fix out of array access
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit be818df547
2012-12-03 20:45:27 +01:00
Michael Niedermayer
12fb647994
mjpegdec: check SE.
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-03 20:45:23 +01:00
Michael Niedermayer
c8c9740ee1
alac: fix integer overflow leading to subsequent out of array accesses.
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3920d13878
2012-12-03 20:45:18 +01:00
Michael Niedermayer
e0884eadf6
alac: fix nb_samples < order case
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit fd4f4923cc
2012-12-03 20:45:13 +01:00
Michael Niedermayer
112d4c400f
iff/ilbm: check remaining buffer size.
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 2fbb37b51b
2012-12-03 20:44:30 +01:00
Michael Niedermayer
0b9be54e97
tiffdec: check count in metadata reading.
...
Fixes out of array access
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6d1c5ea04a
2012-12-03 20:39:42 +01:00
Michael Niedermayer
18817d4b80
swr: use 64bit index/len for x86_64 mix
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d23e8f53ad
2012-12-03 19:36:15 +01:00
Michael Niedermayer
9d9d16b33f
mpegvideo enc: choose VBV buffer size for mpeg4 when none is specified instead of failing
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3556e7ce73
2012-12-03 19:36:15 +01:00
Michael Niedermayer
8b170ee5d8
mpegvideo enc: choose VBV buffer size for mpeg1/2 when none is specified instead of failing
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1856162caa
2012-12-03 19:36:15 +01:00
Michael Niedermayer
86c8ab1fd8
ffv1: fix array data types
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 106790a4e9
2012-12-03 19:36:15 +01:00
Michael Niedermayer
8c103410a6
movenc: fix regression with yuyv caused by c5f23d
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ac6659aff7
2012-12-03 19:36:15 +01:00
Michael Niedermayer
5bd5bb9e56
libvorbisenc: fix afq delay setting
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 2c34367b4a
2012-12-03 19:36:15 +01:00
Michael Niedermayer
e2935721e0
aacenc: fix out of array writes
...
The value used in allocation is based on a estimate of the
maximum size of the spectral coefficients multiplied with 2
and rounded up. The exact or a tighter limit should be
found and used instead. But this issue shouldnt be left
open until someone works on that.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d56834201b
2012-12-03 19:36:15 +01:00
Martin Ettl
ce433996d7
ffserver: fix potential buffer overflow, based on wrong fscanf format indentifier.
...
Fixed Ticket1780
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f077e1fb4c
2012-12-03 19:36:15 +01:00
jamal
e21a53b6eb
fate: Fix --disable-zlib
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 062cd9acc1
2012-12-03 19:36:15 +01:00
Michael Niedermayer
7a67a70efa
lavf: free probe data in case we close before probing finished
...
Fixes Ticket1634
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 44a7a6300d
2012-12-03 19:36:15 +01:00
Michael Niedermayer
3be4f230c6
ffv1enc: fix integer overflow with high resolutions and lots of slices.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f049729e61
2012-12-03 19:36:15 +01:00
Michael Niedermayer
9913ecc68d
configure: add missing dependancies for gpl tests
...
fixes fate without --enable-gpl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 4fefe91a33
2012-12-03 19:36:15 +01:00
Clément Bœsch
09c79d50d8
lavf/swfdec: fix flushing with compressed swf.
...
We now only return in the middle of the refill in case of read error, so
inflate can be re-called if zlib needs an empty (z.avail_in=0) inflate
call for flushing.
2012-12-03 16:40:17 +01:00
Michael Niedermayer
a74f292d4a
tests/Makefile: fix ffprobe test dependancy
...
This fixes the ffprobe tests under mingw/wine
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a96e3a3e77
2012-09-28 03:02:28 +02:00
Michael Niedermayer
38df088545
asfenc: avoid negative timestamps
...
Fixes Ticket1606
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b4c753487c
2012-09-28 02:47:37 +02:00
