Michael Niedermayer
28ef8eaeef
libfaac: Fix assignments in if()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 68a25c64cd
2013-01-20 23:04:20 +01:00
Michael Niedermayer
3e57b37ddb
aacenc: Fix assignments in if()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 98fed59427
2013-01-20 23:04:18 +01:00
Michael Niedermayer
04c74a339f
update for FFmpeg 1.0.2
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-20 22:27:57 +01:00
Michael Niedermayer
ece68a0363
mpeg1enc: Disable threads for resolutions too large for multi-threading
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0c6b0409af
2013-01-20 04:25:52 +01:00
Michael Niedermayer
95f8701c32
mpeg12enc: check dimension validity
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 7fb87bc5f2
2013-01-20 02:45:35 +01:00
Michael Niedermayer
5af4171304
mpeg12enc: Correctly mask dimensions
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit bcc4ef1a41
2013-01-20 02:45:34 +01:00
Michael Niedermayer
3e36cba430
mpeg12: Support decoding dimensions that are a multiple of 4096
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 878e5bd6f5
2013-01-20 02:45:33 +01:00
Ronald S. Bultje
d369cc83aa
h264: add 3 pixels below for subpixel filter wait position.
...
If the motion vector is at a subpixel position, we need 3 pixels below
the motion vector's wholepel position available, not 2, since the MC
filter is a sixtap filter for the hpel position, and then a bilin filter
for the qpel position.
This patch fixes highly irreproducible (0.1%) fate failures in frame 2
and 4 of h264-conformance-cama2_vtc_b (e.g. first P-frame, first field,
last line of MB x=40,y=2 and second field and last lines of MBs x=39-40,
y=3). These used pre-loopfilter instead of post-loopfilter data because
the await_progress() waited for one line too little in that field, and
the motion vector of these particular MBs happened to align exactly to a
position where that demonstrates the bug.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 2c85d7c015
2013-01-20 02:43:06 +01:00
Ronald S. Bultje
ac6b2fecf4
h264: don't clobber mmco opcode tables for non-first slice headers.
...
Clobbering these tables will temporarily clobber the template used
as a basis for other threads to start decoding from. If the other
decoding thread updates from the template right at that moment,
subsequent threads will get invalid (or, usually, none at all) mmco
tables. This leads to invalid reference lists and subsequent decode
failures.
Therefore, instead, decode the mmco tables only for the first slice in
a field or frame. For other slices, decode the bits and ensure they
are identical to the mmco tables in the first slice, but don't ever
clobber the context state. This prevents other threads from using a
clobbered/invalid template as starting point for decoding, and thus
fixes decoding in these cases.
This fixes occasional (~1%) failures of h264-conformance-mr1_bt_a with
frame-multithreading enabled.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f6badba185
2013-01-20 02:42:47 +01:00
Michael Niedermayer
bca27b0480
swr: fix handling of timestamps that cause multiple drops or silence injections
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d676598f87
2013-01-20 02:40:22 +01:00
Carl Eugen Hoyos
c287efcc44
Only skip MLP header in mpeg files if the codec actually is MLP.
...
Fixes PCM audio in Kansas Pheasant Hunt 2000 mpg file.
Reported-by: Mashiat Sarker Shakkhar
(cherry picked from commit ad406f7e40
2013-01-17 17:43:01 +01:00
Carl Eugen Hoyos
aa1af0d6ca
Fix detection of struct v4l2_frmsize_discrete.
...
It was always detected successfully.
(cherry picked from commit c345100efc
2013-01-17 02:14:29 +01:00
Michael Niedermayer
302d2591dc
ff_get_audio_frame_size: try to fix wma in wav
...
Fixes Ticket1905, Ticket2114
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 2713e43ac8
2013-01-07 00:55:00 +01:00
Nicolas George
10ac44198d
ffmpeg: mark attachment streams finished.
...
Fix trac ticket #2083 .
(cherry picked from commit 69a1667b06
2013-01-07 00:52:45 +01:00
Piotr Bandurski
7590a125f5
tiffdec: Use the correct height field.
...
Fixes Ticket913
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 4784a135b2
2013-01-07 00:25:36 +01:00
Michael Niedermayer
ff08767817
lavf: Fix codec id forcing with probed codecs
...
Fixes Ticket2088
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 341e40f1e1
2013-01-02 02:22:04 +01:00
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
