ee025a0c61
Merge commit '4d48691622149ba5998de08a0acec85d1f4ed46a' into release/2.4
* commit '4d48691622149ba5998de08a0acec85d1f4ed46a':
cmdutils: Use the correct guard
Conflicts:
cmdutils.c
See: 35daf3ca81
11 years ago
679c3d210f
Merge commit 'bb823e26b1cbb91b475c10772cdfd867d4809a65' into release/2.4
* commit 'bb823e26b1cbb91b475c10772cdfd867d4809a65':
avformat: Make avformat_free_context handle NULL
See: ee23dcf534
11 years ago
1da83d52bc
Merge commit 'b31bb39bdd7b5a53e0d282acc0f0f62b32b17acc' into release/2.4
* commit 'b31bb39bdd7b5a53e0d282acc0f0f62b32b17acc':
rtsp: Check a memory allocation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
564d943b27
avformat/rmdec: Check for overflow in ff_rm_read_mdpr_codecdata()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 03abf55f25
11 years ago
aded1110a3
avformat/rmdec: rm_read_extradata: add error message for oversized extradata
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 50f9de59a0
11 years ago
365e0652f9
Merge commit '036f5c5420e4529f05fa5180f5fa28ca2c5c4065' into release/2.4
* commit '036f5c5420e4529f05fa5180f5fa28ca2c5c4065':
rm: Use the correct codec_data_size signedness
Conflicts:
libavformat/rm.h
libavformat/rmdec.c
See: a6f730730b
11 years ago
1dc53463d9
Merge commit 'da35008c314eae5a10a8c070f5185b7694c0a37e' into release/2.4
* commit 'da35008c314eae5a10a8c070f5185b7694c0a37e':
latm: Do not give a score for a single instance
Conflicts:
libavformat/rawdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
705e0e0513
avformat/mpeg: do not count PES packets inside PES packets during probing
Fixes: misdetection of test2.mp3
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e15b29bb18
11 years ago
85d05fdc80
Merge commit '4baee1124b905cbd75240530e081c8ffa68fddbe' into release/2.4
* commit '4baee1124b905cbd75240530e081c8ffa68fddbe':
mp3: Tweak the probe scores
Conflicts:
libavformat/mp3dec.c
See: ef79bbeddd
11 years ago
c8a2b1ac3c
Merge commit 'bbb86717b303a3e4c0809d3cc6fb55580766a17e' into release/2.4
* commit 'bbb86717b303a3e4c0809d3cc6fb55580766a17e':
vf_frei0r: do not increment string if it reached the end
See: 02a6ee5168
11 years ago
12d6bbf7cb
Merge commit '1fd55ec507f6f47b4d9fddf8e79a0df4540ef6e4' into release/2.4
* commit '1fd55ec507f6f47b4d9fddf8e79a0df4540ef6e4':
svq1dec: Unbreak the scratch buffer allocation
Conflicts:
libavcodec/svq1dec.c
See: 4213fc5b9e
11 years ago
0d801c0bfd
Merge commit '20f9cf744a9a82ac4b269cb4317a5d59a8553baf' into release/2.4
* commit '20f9cf744a9a82ac4b269cb4317a5d59a8553baf':
vaapi: wrap codec specific functions in appropiate #ifs
Conflicts:
libavcodec/vaapi.c
See: f2118d44c9
11 years ago
9d43e51eec
Merge commit '20d6ae4626a42fbc6e7b9c0040bdd64397b23e11' into release/2.4
* commit '20d6ae4626a42fbc6e7b9c0040bdd64397b23e11':
hevc: always clip luma_log2_weight_denom
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
73046fa195
Merge commit '23fe589e19487bc9a40b77dae9509068da5b14b8' into release/2.4
* commit '23fe589e19487bc9a40b77dae9509068da5b14b8':
prores: Evaluate all the quantizers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
0295615f0a
Merge commit '9bd4561d74a46dd6557140e286228e09e380674c' into release/2.4
* commit '9bd4561d74a46dd6557140e286228e09e380674c':
tiff: Check the check_size() return value and forward it
Conflicts:
libavcodec/tiffenc.c
See: d50aa006fb
11 years ago
c69fff3790
Merge commit 'cbf31d5f15774b3ffd1e2009159dc7154a767b09' into release/2.4
* commit 'cbf31d5f15774b3ffd1e2009159dc7154a767b09':
rtpdec_h263_rfc2190: Clear the stored bits if discarding buffered data
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
3c33983b74
Merge commit '21683549edf436024cc3efbc4f8d1d55221c5336' into release/2.4
* commit '21683549edf436024cc3efbc4f8d1d55221c5336':
h261dec: Fix context initialization sequence
See: 6c1ee1a114
11 years ago
e7b8fa2c00
Merge commit 'cbfdbba58e1460bd0791911ad84a6c76b5500a0e' into release/2.4
* commit 'cbfdbba58e1460bd0791911ad84a6c76b5500a0e':
cmdutils: check file access functions return values
Conflicts:
cmdutils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
0afeb76e75
Merge commit '1411f073fdceeff1f39dbaa035c3c0275f69095f' into release/2.4
* commit '1411f073fdceeff1f39dbaa035c3c0275f69095f':
aacenc: correctly check returned value
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
98d4a07ccf
Merge commit '76e9a17f3392e752193015765e9216c2f0716b96' into release/2.4
* commit '76e9a17f3392e752193015765e9216c2f0716b96':
lavfi: always check av_expr_parse_and_eval() return value
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
3cc8822c93
Merge commit '3d0752d82f8eaa326cff306ae50b0186a5b4d304' into release/2.4
* commit '3d0752d82f8eaa326cff306ae50b0186a5b4d304':
xsub: Support DXSA subtitles
Conflicts:
libavcodec/xsubdec.c
See: d6f910ea47
11 years ago
05b1ac2470
Merge commit 'bfe18be88a66da25b60a091de6011197dcb231fd' into release/2.4
* commit 'bfe18be88a66da25b60a091de6011197dcb231fd':
mpeg4audio: check the init_get_bits() return value
Conflicts:
libavcodec/mpeg4audio.c
See: deefdf9788
11 years ago
cc598bf7dc
Merge commit 'f6c82b34a320f105af266997f5951cbe7dfc8a05' into release/2.4
* commit 'f6c82b34a320f105af266997f5951cbe7dfc8a05':
segment: Fix the failure paths
Conflicts:
libavformat/segment.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
dd4adba811
Merge commit '3280b86c85f5a88397fce0230d1878fee79fbb93' into release/2.4
* commit '3280b86c85f5a88397fce0230d1878fee79fbb93':
swscale: check memory allocations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
ee910aef38
Merge commit '61335ab33e594d47b84fde7367ee10dc66fc3465' into release/2.4
* commit '61335ab33e594d47b84fde7367ee10dc66fc3465':
opt: check memory allocation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
cdf37f2548
Merge commit '932caa50a5dec7f2a69da8a417ccae84d19ae5e5' into release/2.4
* commit '932caa50a5dec7f2a69da8a417ccae84d19ae5e5':
libavformat: Check for malloc failures in avformat_new_stream
See: a66893ac94
11 years ago
b96163f055
avformat/utils: check for malloc failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a66893ac94
11 years ago
1fd7fb9036
Update for 2.4.6
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
4d48691622
cmdutils: Use the correct guard
The OptionDef arrays are terminated with a { NULL } element not NULL.
CC: libav-stable@libav.org
Bug-Id: CID 703769
11 years ago
bb823e26b1
avformat: Make avformat_free_context handle NULL
Work as the other free()-like functions.
Bug-Id: CID 1087081
CC: libav-stable@libav.org
11 years ago
b31bb39bdd
rtsp: Check a memory allocation
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
11 years ago
036f5c5420
rm: Use the correct codec_data_size signedness
The function takes a size and not an offset.
CC: libav-stable@libav.org
Sample-Id: rm_deadlock.rm
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
11 years ago
da35008c31
latm: Do not give a score for a single instance
Bug-Id: 773
CC: libav-stable@libav.org
11 years ago
4baee1124b
mp3: Tweak the probe scores
Having more than 10 consecutive frames decoded as mp3 should be
considered a clear signal that the sample is mp3 and not mpegps.
Reported-By: Florian Iragne <florian@iragne.fr>
CC: libav-stable@libav.org
11 years ago
bbb86717b3
vf_frei0r: do not increment string if it reached the end
Bug-Id: 778
CC: libav-stable@libav.org
11 years ago
1fd55ec507
svq1dec: Unbreak the scratch buffer allocation
The input packets are always assumed to be padded and
the av_fast_ family of function takes a pointer to a pointer.
Thanks to Nicolas Dufresne <nicolas.dufresne@collabora.com> for
a similar patch.
Introduced in 7b588bb691libav-stable@libav.org
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
11 years ago
20f9cf744a
vaapi: wrap codec specific functions in appropiate #ifs
Fix linking when only a subset of vaapi decoders is enabled.
Bug-Id: 760
CC: libav-stable@libav.org
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
11 years ago
20d6ae4626
hevc: always clip luma_log2_weight_denom
Its value shall be between 0 and 7 according to the specifications.
CC: libav-stable@libav.org
Bug-Id: CID 1257502
11 years ago
23fe589e19
prores: Evaluate all the quantizers
Prevent an uninitialized data access.
CC: libav-stable@libav.org
Bug-Id: CID 703824 / CID 703825
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
11 years ago
9bd4561d74
tiff: Check the check_size() return value and forward it
Also use the same type for add_entry and check_size.
Bug-Id: CID 700699
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Vittorio Giovara <vittorio.giovarao@gmail.com>
11 years ago
cbf31d5f15
rtpdec_h263_rfc2190: Clear the stored bits if discarding buffered data
If we throw away the buffered incomplete frame, make sure to also
throw away the buffered bits of an incomplete byte at the same
time.
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit df07c07b3d
11 years ago
21683549ed
h261dec: Fix context initialization sequence
ff_mpv_common_init sets s->context_initialized.
This fixes decoding of h261 in the cases where the demuxer
hasn't already set the frame size.
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 3bb465245f
11 years ago
cbfdbba58e
cmdutils: check file access functions return values
CC: libav-stable@libav.org
Bug-Id: CID 703706
(cherry picked from commit 38129c26c5
11 years ago
1411f073fd
aacenc: correctly check returned value
CC: libav-stable@libav.org
(cherry picked from commit 971099ff5a
11 years ago
76e9a17f33
lavfi: always check av_expr_parse_and_eval() return value
CC: libav-stable@libav.org
Bug-Id: CID 703624
(cherry picked from commit 63be97ec40
11 years ago
3d0752d82f
xsub: Support DXSA subtitles
These have a DXSA tag and contain alpha in addition to
color values for palette.
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 5a1addd7c1
11 years ago
bfe18be88a
mpeg4audio: check the init_get_bits() return value
Fixes possible invalid reads.
CC:libav-stable@libav.org
(cherry picked from commit 7e4e010b80
11 years ago
f6c82b34a3
segment: Fix the failure paths
A failure in segment_end() or segment_start() would lead to freeing
a dangling pointer and in general further calls to seg_write_packet()
or to seg_write_trailer() would have the same faulty behaviour.
CC: libav-stable@libav.org
Reported-By: luodalongde@gmail.com
(cherry picked from commit b3f0465736
11 years ago
3280b86c85
swscale: check memory allocations
CC: libav-stable@libav.org
Bug-Id: CID 1257779
(cherry picked from commit 1dd797e3c9f179f957316a0becbec048b42df8aa)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
11 years ago
61335ab33e
opt: check memory allocation
CC: libav-stable@libav.org
Bug-Id: CID 1257771
(cherry picked from commit 07a0c0f0005072d115ace61e60f46be68582cc3a)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
11 years ago
Michael Niedermayer
wm4
Luca Barbato
Michael Lynch
Vittorio Giovara
Thiago Santos
Martin Storsjö
Alexandre Colucci
Anton Khirnov