9f8f2bcab6
Merge commit 'c3bd1d60af97e8d2568dac9fcce7bdabb4ff93c8'
...
* commit 'c3bd1d60af97e8d2568dac9fcce7bdabb4ff93c8':
formats: Check memory allocations
Conflicts:
libavfilter/formats.c
See: 527ca3985c
2015-03-12 22:40:56 +01:00
8b3a681aaa
Merge commit '5a2645cafeca1c2207ac55cc831c3349572a82ed'
...
* commit '5a2645cafeca1c2207ac55cc831c3349572a82ed':
nutdec: Prevent leaks on memory error
Conflicts:
libavformat/nutdec.c
See: 269845db86
2015-03-12 22:01:57 +01:00
98c387c9c1
Merge commit 'edca1dd552efa1ebef016ca9eff4ce6757605819'
...
* commit 'edca1dd552efa1ebef016ca9eff4ce6757605819':
xcbgrab: Check av_strdup() allocation
Conflicts:
libavdevice/xcbgrab.c
See: db442c8736
2015-03-12 21:51:15 +01:00
a91c175db2
Merge commit '17c45d4d056d0e10ecb88b424ec9e68be398da5e'
...
* commit '17c45d4d056d0e10ecb88b424ec9e68be398da5e':
libtheora: Check frame allocation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-12 21:41:55 +01:00
9ecfe0b878
Merge commit 'a72d93daa09ffbad2771f1450820941055eaf210'
...
* commit 'a72d93daa09ffbad2771f1450820941055eaf210':
mpegvideo_enc: Check AVCodecContext allocation
Conflicts:
libavcodec/mpegvideo_enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-12 21:30:37 +01:00
0bc2da6dcf
Merge commit '78c892284150e12f6b08b287bdf7e62307c6985f'
...
* commit '78c892284150e12f6b08b287bdf7e62307c6985f':
dca: Document the permuted order in the lfe_fir_64 and lfe_fir_128 tables
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-12 21:20:24 +01:00
d5addf1555
hevcdsp: fix compilation for arm and aarch64
...
Also add av_cold to ff_hevcdsp_init_arm.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-12 20:01:01 +01:00
913aa9a487
libx264: Return more meaningful error codes
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-03-12 19:09:22 +01:00
6bdae41d3e
matroskadec: Check memory allocations
...
CC: libav-stable@libav.org
2015-03-12 17:48:14 +00:00
c3bd1d60af
formats: Check memory allocations
2015-03-12 17:46:47 +00:00
a251aa1a35
mips/asmdefs: use _ABI64 as defined by gcc
...
Unfortunately android < api 21 (lollipop) doesn't have the sgidefs.h header,
the easiest way around this is to just use the preprocessor definitions from
gcc / clang.
Signed-off-by: James Cowgill <james410@cowgill.org.uk>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-12 16:45:31 +01:00
5a2645cafe
nutdec: Prevent leaks on memory error
...
Bug-Id: CID 205122 / CID 205123
2015-03-12 15:29:59 +00:00
edca1dd552
xcbgrab: Check av_strdup() allocation
...
Bug-Id: CID 1274038
2015-03-12 15:29:59 +00:00
17c45d4d05
libtheora: Check frame allocation
2015-03-12 15:29:59 +00:00
a72d93daa0
mpegvideo_enc: Check AVCodecContext allocation
2015-03-12 15:29:59 +00:00
27191b82de
avcodec/vp9: Fix undefined shifts in decode_frame_header()
...
Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-12 15:31:41 +01:00
b7cb8b3d43
avcodec/h264_mb: Fix undefined shifts
...
Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-12 15:16:46 +01:00
31816eae32
hevc: delay ff_thread_finish_setup for hwaccel
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-12 14:49:41 +01:00
78c8922841
dca: Document the permuted order in the lfe_fir_64 and lfe_fir_128 tables
2015-03-12 13:28:42 +01:00
22af79a9c8
Merge commit 'b97f427fb56bdbf7de8e2d4b72d01114aa6eceda'
...
* commit 'b97f427fb56bdbf7de8e2d4b72d01114aa6eceda':
lavf: Explicitly convert types at function pointer assignment
Conflicts:
libavformat/avio.c
libavformat/aviobuf.c
libavformat/swfenc.c
See: a76a2ffe9d
2015-03-12 12:38:20 +01:00
7d63f10c37
Merge commit '9c8074050745184a61059ad56045ad711299e33d'
...
* commit '9c8074050745184a61059ad56045ad711299e33d':
configure: Mark qsv subsystem as not selectable on the command line
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-12 12:25:39 +01:00
d5232d4717
avfilter/colormatrix:add slice threading
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-12 03:45:42 +01:00
26d81b5703
avutil/buffer: Avoid moving the AVBufferRef to a new place in memory in av_buffer_make_writable()
...
This allows making a AVBufferRef writable without the need to
update all pointers to it
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-12 02:15:28 +01:00
35fad1e9c9
avutil/buffer: Avoid moving the AVBufferRef to a new place in memory in av_buffer_realloc()
...
This allows reallocating AVBufferRefs without the need to update
all pointers to it
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-12 02:15:28 +01:00
3bedc99723
Merge commit '67142a8c721c7916c9ad2eb439c14d567aeb88c1'
...
* commit '67142a8c721c7916c9ad2eb439c14d567aeb88c1':
roqvideoenc: set enc->avctx in roq_encode_init
See: cf82c426fa
2015-03-12 00:32:03 +01:00
a277c545b2
Merge commit '72211a2af0470799c9611b9c1c7039ab14a34a0a'
...
* commit '72211a2af0470799c9611b9c1c7039ab14a34a0a':
asfenc: fix leaking asf->index_ptr on error
See: 2c8cff2be4
2015-03-12 00:24:05 +01:00
e197dc04bb
Merge commit '212556cd2144659dc6b9d121ddb38cd272bd10ae'
...
* commit '212556cd2144659dc6b9d121ddb38cd272bd10ae':
qsv: Improve the log message of when initializing MFX_IMPL_HARDWARE{2, 3, 4}
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-12 00:15:58 +01:00
b97f427fb5
lavf: Explicitly convert types at function pointer assignment
...
This fixes a number of "assignment from incompatible pointer type" warnings.
2015-03-11 23:53:13 +01:00
9c80740507
configure: Mark qsv subsystem as not selectable on the command line
2015-03-11 23:40:41 +01:00
2ba0ef4b15
Merge commit '7a76c6c4df31d1ff65464ccf3171acd57ef004eb'
...
* commit '7a76c6c4df31d1ff65464ccf3171acd57ef004eb':
configure: Enable colored output for gcc 4.9+
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-11 20:38:08 +01:00
693b8f11d7
Merge commit 'bacc92b59bfa5d6a1f631e63e46fc1d2fb934e51'
...
* commit 'bacc92b59bfa5d6a1f631e63e46fc1d2fb934e51':
rtpdec_vp9: Drop extra sanity check for size of input packet
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-11 20:28:45 +01:00
67142a8c72
roqvideoenc: set enc->avctx in roq_encode_init
...
So far it is only set in roq_encode_frame, but it is used in
roq_encode_end to free the coded_frame. This currently segfaults if
roq_encode_frame is not called between roq_encode_init and
roq_encode_end.
CC:libav-stable@libav.org
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-03-11 20:28:13 +01:00
72211a2af0
asfenc: fix leaking asf->index_ptr on error
...
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-03-11 20:24:59 +01:00
2d37c57f3e
Merge commit 'fe99c52fa99e44961a09cd1324aefd492b797fc8'
...
* commit 'fe99c52fa99e44961a09cd1324aefd492b797fc8':
mp3: Properly use AVCodecContext API
Conflicts:
libavformat/mp3dec.c
See: 6ad42b3e15b851bc20c6
2015-03-11 20:21:16 +01:00
e48ff13ba7
Merge commit '9272c965d9559a90ee64d46aebd99c117e07f7a3'
...
* commit '9272c965d9559a90ee64d46aebd99c117e07f7a3':
matroskaenc: Fix type used for chapter timestamps
Conflicts:
libavformat/matroskaenc.c
See: a4cd057bc7
2015-03-11 20:09:18 +01:00
f3a35e9d59
Merge commit 'dc2d0e06af459af9a7f91b65e0a3119acc4f1baa'
...
* commit 'dc2d0e06af459af9a7f91b65e0a3119acc4f1baa':
mlpdec: support TrueHD streams with an Atmos substream
See: 36bf549b27
2015-03-11 19:59:06 +01:00
7cc63c4bbc
Merge commit 'f36f6a608b5b2c17f8876195c61621c8f8607cee'
...
* commit 'f36f6a608b5b2c17f8876195c61621c8f8607cee':
mlpdec: support major sync headers with optional extension blocks
See: ff34b2d6d3
2015-03-11 19:51:48 +01:00
212556cd21
qsv: Improve the log message of when initializing MFX_IMPL_HARDWARE{2, 3, 4}
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-03-11 19:48:01 +01:00
fd4e17fcc2
avcodec/mpegvideo_motion: Fix undefined shifts in mpeg_motion_internal()
...
Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-11 19:12:38 +01:00
7a76c6c4df
configure: Enable colored output for gcc 4.9+
2015-03-11 18:01:36 +00:00
bacc92b59b
rtpdec_vp9: Drop extra sanity check for size of input packet
...
In this case len is always at least 1, since it is checked against
RTP_VP9_DESC_REQUIRED_SIZE + 1 and then it is reduced by
RTP_VP9_DESC_REQUIRED_SIZE before entering the has_pic_id check.
Bug-Id: CID 1270811
2015-03-11 18:01:25 +00:00
fe99c52fa9
mp3: Properly use AVCodecContext API
...
Rather than having an unitialized context on the stack, allocate it with
defaults and free it when unneeded.
CC: libav-stable@libav.org
2015-03-11 17:57:56 +00:00
c756b3fca2
avcodec/h264dsp_template: Fix undefined shift in biweight_h264_pixels and weight_h264_pixels
...
Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-11 18:57:36 +01:00
9272c965d9
matroskaenc: Fix type used for chapter timestamps
2015-03-11 17:56:51 +00:00
2391e46430
avcodec/mpegvideo: Fix undefined shift in ff_mpv_lowest_referenced_row()
...
Also moves the shift out of the inner loop
Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-11 17:59:59 +01:00
9b2a964cee
avcodec/vp8: Fix undefined shifts in vp8_mc_luma()
...
Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-11 16:55:07 +01:00
8617bc6ffa
avcodec/golomb: Fix undefined shifts in unsigned rice decoding code
...
Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-11 16:47:13 +01:00
8c7a0932ab
avcodec/amrnbde: Fix undefined shift in decode_pitch_vector()
...
This also simplifies the code
Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-11 16:29:40 +01:00
dc2d0e06af
mlpdec: support TrueHD streams with an Atmos substream
...
The fourth substream is being discarded, since its not raw audio data,
but an encoded Atmos stream which needs a specialized decoder.
Fixes decoding of the true hd stream from Transformers\ -\ Age\ of\ Extinction\ 2014\ 1080P-003.mkv
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-03-11 16:06:40 +01:00
f36f6a608b
mlpdec: support major sync headers with optional extension blocks
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-03-11 16:03:13 +01:00
Michael Niedermayer
James Almer
Himangi Saraogi
Vittorio Giovara
James Cowgill
Rainer Hochecker
Niels Möller
Yayoi
Diego Biurrun
Andreas Cadhalpun
Yukinori Yamazoe
Hendrik Leppkes