Michael Niedermayer
daff49ccf3
Merge commit ' 80f955c908'
...
* commit '80f955c908
2015-07-03 04:36:31 +02:00
Andreas Cadhalpun
0762152f7a
webp: fix infinite loop in webp_decode_frame
...
The loop always needs at least 8 bytes for chunk_type and chunk_size.
If fewer are left, bytestream2_get_le32 just returns 0 without
reading any bytes, leading to an infinite loop.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-03 04:06:19 +02:00
Michael Niedermayer
a8ab64d2f7
Merge commit ' 910247f172'
...
* commit '910247f172
2015-07-03 03:40:22 +02:00
Luca Barbato
80f955c908
vda: Check the correct pointer for buffer allocation
...
CC: libav-stable@libav.org
Found-By: kropping
2015-07-03 01:58:32 +02:00
Andreas Cadhalpun
76d4c62734
webp: Make sure enough bytes are available
...
Every chunk needs at least 8 bytes for chunk_type and chunk_size.
Prevent a possible infinite loop.
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-07-03 01:50:09 +02:00
Vittorio Giovara
910247f172
lavc: Deprecate avctx.{inter,intra}_quant_bias
...
They are used by dnxhd and mpegvideo_enc exclusively, move them to codec
private options instead.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-02 22:37:59 +01:00
Andreas Cadhalpun
d0eff8857c
wavpack: limit extra_bits to 32 and use get_bits_long
...
More than 32 bits can't be stored in an integer and get_bits should not
be used with more than 25 bits.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-07-02 23:31:16 +02:00
Ivan Uskov
6e5864ab29
avcodec/qsvenc_h264: Change the set of performance presets to match with the MFX library constants.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-02 19:16:41 +02:00
Michael Niedermayer
c9220d5b06
avcodec/mjpegdec: Reorder operations to avoid undefined behavior
...
Fixes: asan_heap-oob_1dd60fd_267_cov_2954683513_5baad44ca4702949724234e35c5bb341.jpg
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-02 18:53:32 +02:00
Michael Niedermayer
9dc0bac971
avcodec/motion_est_template: Fix undefined shifts in CHECK_MV()
...
Fixes:asan_heap-oob_4d5bb0_2295_cov_3374722539_hotel_california_ra5.1_640x480_30s.rmvb
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-02 18:43:03 +02:00
Ivan Uskov
db89f45535
avcodec/qsv: Extending QSV/MFX session initialization for the linux platform where a display handle is required.
...
Now ff_qsv_init_internal_session() is able
to find appropriate display handle under linux using VAAPI.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-02 15:05:56 +02:00
Michael Niedermayer
06a0d5ef5c
avcodec/h264dsp_template: Fix undefined shifts
...
Fixes: asan_heap-oob_17212bc_2243_cov_594210248_h264_TTA.mkv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 20:39:25 +02:00
Michael Niedermayer
ce81e47c91
avcodec/mss2: Fix integer overflow
...
This also simplifies the code
Fixes: signal_sigabrt_7ffff6ac8cc9_2943_cov_3588637614_mss2_speech.wmv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 20:30:48 +02:00
Michael Niedermayer
6205143bb3
Merge commit ' 9eec23b8a7'
...
* commit '9eec23b8a7
2015-07-01 19:09:55 +02:00
Michael Niedermayer
92c858ae66
Merge commit ' 4ccccd6c40'
...
* commit '4ccccd6c40
2015-07-01 19:09:10 +02:00
Michael Niedermayer
9cf95654ac
Merge commit ' 007e27d363'
...
* commit '007e27d363
2015-07-01 18:58:01 +02:00
John Adlum
089a818bd3
avcodec/pthread_frame: Correcting typo of "occurred"
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 18:47:44 +02:00
Shivraj Patil
2eb28e889d
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for mpegvideo functions
...
This patch adds MSA (MIPS-SIMD-Arch) optimizations for mpegvideo functions in new file mpegvideo_msa.c
Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 17:32:47 +02:00
Michael Niedermayer
4e0819310e
elsdec: Replace EOVERFLOW with INVALIDDATA
...
EOVERFLOW is not available on all platforms.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 16:26:42 +01:00
Michael Niedermayer
53fd70579b
avcodec/h264_mvpred: Fix undefined shifts in MAP_F2F
...
Fixes: asan_heap-oob_17301a3_2100_cov_3226131691_ff_add_pixels_clamped_mmx.m2ts
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 15:53:15 +02:00
Michael Niedermayer
ac78014f0b
avcodec/motion_est: Fix some undefined shifts
...
Fixes: asan_heap-oob_1dd60fd_1049_cov_4200102444_P4250048.MOV
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 15:42:07 +02:00
Janne Grunau
9eec23b8a7
g2meet: use av_ceil_log2 instead of a custom function
2015-07-01 13:58:34 +02:00
Michael Niedermayer
4eee685a21
avcodec/motion_est: Fix undefined shifts in cmp_inline()
...
Fixes: signal_sigsegv_35eac16_2762_cov_2704249783_missing_frames.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 13:42:06 +02:00
Michael Niedermayer
0ea099ad3e
avcodec/mpegvideo_enc: fix undefined shifts in ff_dct_quantize_c()
...
Fixes: signal_sigsegv_35eac16_2762_cov_2704249783_missing_frames.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 13:40:36 +02:00
Janne Grunau
4ccccd6c40
g2meet: use an unsigned type for the djb hash
2015-07-01 13:34:50 +02:00
Michael Niedermayer
56fd4705c0
avcodec/motion_est_template: Fix undefined shifts in CHECK_MV_DIR()
...
Fixes: signal_sigsegv_2e64ee0_2762_cov_4170502227_missing_frames.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 12:21:56 +02:00
Janne Grunau
007e27d363
avcodec: add missing CODEC_CAP_DR1 to codecs using get_buffer()
2015-07-01 12:10:25 +02:00
Michael Niedermayer
dec728888f
avcodec/elsdec: Remove EOVERFLOW
...
EOVERFLOW is not available on all platforms
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 04:24:58 +02:00
Michael Niedermayer
16dd0426e5
Merge commit ' 3f872c9bfa'
...
* commit '3f872c9bfa
2015-07-01 03:36:32 +02:00
Michael Niedermayer
68939f7682
Merge commit ' 08c2d8f0aa'
...
* commit '08c2d8f0aa
2015-07-01 03:18:30 +02:00
Michael Niedermayer
2e13a45b1a
avcodec/aacsbr: Assert that bs_num_env is positive
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 02:34:01 +02:00
Michael Niedermayer
79a98294da
avcodec/aacsbr: check that the element type matches before applying SBR
...
Fixes out of array access
Fixes: signal_sigsegv_3670fc0_2818_cov_2307326154_moon.mux
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 02:33:45 +02:00
Vittorio Giovara
3f872c9bfa
lavc: Add missing API guard to dtg_active_format option
2015-07-01 00:13:58 +01:00
Kostya Shishkov
08c2d8f0aa
Go2Meeting decoder
...
ELS and ePIC decoder courtesy of Maxim Poliakovski,
cleanup and integration by Diego Biurrun.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-07-01 01:08:15 +02:00
Andreas Cadhalpun
32a5b63126
pthread_frame: forward error codes when flushing
...
This is the first part of the fix for ticket #4370 .
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-07-01 00:32:21 +02:00
Nicolas DEROUINEAU
04a68f4348
avcodec/h264: Greenmetadata SEI parsing
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-30 23:20:36 +02:00
Michael Niedermayer
7e9c7b623f
Merge commit ' 271ce76d31'
...
* commit '271ce76d31d6e956694922291c372f
2015-06-30 22:54:33 +02:00
Michael Niedermayer
8e6c5c4322
Merge commit ' 0bfab80a0d'
...
* commit '0bfab80a0d
2015-06-30 22:29:34 +02:00
Michael Niedermayer
2a227fe879
Merge commit ' 0a49a62f99'
...
* commit '0a49a62f9962006b539d
2015-06-30 22:14:25 +02:00
Michael Niedermayer
5585da7c5e
Merge commit ' 6f4cd33efb'
...
* commit '6f4cd33efb
2015-06-30 22:01:32 +02:00
Michael Niedermayer
4ff0c61ba8
Merge commit ' 303ec065a9'
...
* commit '303ec065a9
2015-06-30 21:19:22 +02:00
Michael Niedermayer
2e9dcb82e5
Merge commit ' 3e3056f2a0'
...
* commit '3e3056f2a0
2015-06-30 21:11:49 +02:00
Vittorio Giovara
271ce76d31
h264: Parse registered data SEI message and AFD value
...
Partially based on code by Marton Balint and Kieran Kunhya.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-06-30 15:34:38 +02:00
Vittorio Giovara
0bfab80a0d
h264_sei: Group error check outside the switch block
2015-06-30 15:34:38 +02:00
Luca Barbato
0a49a62f99
h263: Always check both dimensions
...
CC: libav-stable@libav.org
Found-By: ago@gentoo.org
2015-06-30 15:34:38 +02:00
Luca Barbato
6f4cd33efb
cosmetic: Reformat ff_h263_decode_mba
2015-06-30 15:34:38 +02:00
Vittorio Giovara
303ec065a9
aic: Fix slice size computation for widths multiples of 32 macroblocks
...
CC: libav-stable@libav.org
2015-06-30 15:34:37 +02:00
Vittorio Giovara
3e3056f2a0
h264: Allow stream and container cropping at the same time
...
The container cropping is applied only when difference is within 16
pixels, and the smallest value between the two is chosen.
Bug-Id: 383
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-06-30 15:34:37 +02:00
Michael Niedermayer
330863c9f1
avcodec/h264_slice: Use w/h from the AVFrame instead of mb_w/h
...
Fixes out of array access
Fixes: asan_heap-oob_4d5bb0_682_cov_3124593265_Fraunhofer__a_driving_force_in_innovation__small.mp4
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-30 19:38:44 +02:00
Carl Eugen Hoyos
0f5b996531
lavc/j2kenc: Make jp2 output compatible with Kakadu.
...
Fixes ticket #4689 .
2015-06-30 15:00:38 +02:00
