34b28d3823
Merge commit 'd1ad85fc020653be5ad25ed1d3d5091e89fee782' into release/2.4
* commit 'd1ad85fc020653be5ad25ed1d3d5091e89fee782':
vf_format: check input validity
See: ee16e0cacc
11 years ago
153a012384
Merge commit '6cf27b550d66963b89b5917568b85c4b49fb18ba' into release/2.4
* commit '6cf27b550d66963b89b5917568b85c4b49fb18ba':
aviobuf: check context before using it
See: 7441d1ec33
11 years ago
d6f4e475a1
Merge commit '5aceced0a0d235d485e88fda502019b221dbf3d2' into release/2.4
* commit '5aceced0a0d235d485e88fda502019b221dbf3d2':
avio: fix sizeof argument
See: a96577df38
11 years ago
a299d93928
Merge commit '27487944eff721ef8e310db1a2a52329d9377f71' into release/2.4
* commit '27487944eff721ef8e310db1a2a52329d9377f71':
swscale: fix sign extensions in yuv planar conversion
Conflicts:
libswscale/rgb2rgb_template.c
See: a07e9d72a1a30972609c
11 years ago
39f2e53a24
Merge commit '51f76e4e932ebdce8ccf6cf0797651d632cfc3e2' into release/2.4
* commit '51f76e4e932ebdce8ccf6cf0797651d632cfc3e2':
oss_audio: use a macro to simplify ioctl() error checking
Conflicts:
libavdevice/oss_audio.c
See: 69c7aad494
11 years ago
adfb4661d9
Merge commit 'c246b0b4c3a3b02a714e99423cf23d59f8f81409' into release/2.4
* commit 'c246b0b4c3a3b02a714e99423cf23d59f8f81409':
avresample: Make sure the even check does not overflow
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
b400412443
Merge commit 'daef7feb09a0dde2265d56f77de8ae03f9612d47' into release/2.4
* commit 'daef7feb09a0dde2265d56f77de8ae03f9612d47':
af_resample: check av_opt_set_dict return value
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
158cf1d52d
Merge commit '2496dbd68b29bd36fbf4753a46163d33f6dae70e' into release/2.4
* commit '2496dbd68b29bd36fbf4753a46163d33f6dae70e':
vf_showinfo: Forward the av_image_get_linesize error
Conflicts:
libavfilter/vf_showinfo.c
See: 2aecfd4f20
11 years ago
6fd7456f85
Merge commit '608e8d8dd754199b657b439f9e722e0b45f84461' into release/2.4
* commit '608e8d8dd754199b657b439f9e722e0b45f84461':
vf_drawtext: Do not leak the mmapped textfile
Conflicts:
libavfilter/vf_drawtext.c
See: 6956b048d8
11 years ago
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
d1ad85fc02
vf_format: check input validity
CC: libav-stable@libav.org
11 years ago
6cf27b550d
aviobuf: check context before using it
Avoid a possible null pointer dereference.
CC: libav-stable@libav.org
Bug-Id: CID 1135769
11 years ago
5aceced0a0
avio: fix sizeof argument
CC: libav-stable@libav.org
Bug-Id: CID 732284
11 years ago
27487944ef
swscale: fix sign extensions in yuv planar conversion
Casting the left-most byte to unsigned avoids an undefined
result of the shift by 24 if bit 7 is set.
yuvPlanartouyvy_c and yuvPlanartoyuy2_c are affected.
CC: libav-stable@libav.org
Bug-Id: CID 732281 / CID 732282
11 years ago
51f76e4e93
oss_audio: use a macro to simplify ioctl() error checking
Also add a note about SNDCTL_DSP_GETFMTS which may fail even if OSS is
available.
CC: libav-stable@libav.org
Bug-Id: CID 1238992
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
11 years ago
c246b0b4c3
avresample: Make sure the even check does not overflow
CC: libav-stable@libav.org
Bug-Id: CID 732225
11 years ago
daef7feb09
af_resample: check av_opt_set_dict return value
CC: libav-stable@libav.org
Bug-Id: CID 1087076
11 years ago
2496dbd68b
vf_showinfo: Forward the av_image_get_linesize error
CC: libav-stable@libav.org
Bug-Id: CID 1087086
11 years ago
608e8d8dd7
vf_drawtext: Do not leak the mmapped textfile
And validate its size while at it.
CC: libav-stable@libav.org
Bug-Id: CID 1244189
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
Michael Niedermayer
wm4
Vittorio Giovara
Timothy Gu
Luca Barbato
Michael Lynch