OSDN Git Service
Michael Niedermayer [Sat, 14 Mar 2015 20:23:32 +0000 (21:23 +0100)]
avformat/mov: Use sizeof(filename) instead of a literal number
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Sat, 14 Mar 2015 13:26:16 +0000 (14:26 +0100)]
lavc: use LOCAL_ALIGNED instead of DECLARE_ALIGNED
The later may yield incorrect code for on-stack variables.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Sat, 14 Mar 2015 13:30:18 +0000 (14:30 +0100)]
x86: lavc: use LOCAL_ALIGNED instead of DECLARE_ALIGNED
The later may yield incorrect code for on-stack variables.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Sat, 14 Mar 2015 15:30:27 +0000 (15:30 +0000)]
ppc: lavc: use LOCAL_ALIGNED instead of DECLARE_ALIGNED
The later may yield incorrect code for on-stack variables.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Sat, 14 Mar 2015 15:30:26 +0000 (15:30 +0000)]
ppc: libswscale: use LOCAL_ALIGNED instead of DECLARE_ALIGNED
The later may yield incorrect code for on-stack variables.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 14 Mar 2015 16:11:59 +0000 (17:11 +0100)]
avcodec/wmadec: Fix undefined shift in wma_decode_block()
Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Sat, 14 Mar 2015 11:49:00 +0000 (11:49 +0000)]
ac3dec: cosmetics
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Sat, 14 Mar 2015 11:48:59 +0000 (11:48 +0000)]
eac3dec: fix scaling
This is the remaining error, the output on the SPX samples,
respectively csi_miami_stereo_128_spx.eac3 and
csi_miami_5.1_256_spx.eac3, goes from:
stddev: 8.71 PSNR: 77.52 MAXDIFF: 235
stddev:24270.51 PSNR: 22.17 MAXDIFF:47166
to:
stddev: 0.12 PSNR:114.12 MAXDIFF: 1
stddev: 0.12 PSNR:114.73 MAXDIFF: 1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Sat, 14 Mar 2015 11:48:58 +0000 (11:48 +0000)]
ac3_fixed: fix computation of spx_noise_blend
It was set to 1 instead of sqrt(3)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Sat, 14 Mar 2015 11:48:57 +0000 (11:48 +0000)]
ac3_fixed: fix out-of-bound read
Should also improve decoding, but actually doesn't...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Tue, 10 Mar 2015 23:11:54 +0000 (23:11 +0000)]
x86: xvid_idct: SSE2 merged add version
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Tue, 10 Mar 2015 23:11:53 +0000 (23:11 +0000)]
x86: xvid_idct: merged idct_put SSE2 versions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Sat, 14 Mar 2015 07:57:43 +0000 (07:57 +0000)]
x86: dct-test: evaluate prores idct avx version
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Sat, 14 Mar 2015 07:57:42 +0000 (07:57 +0000)]
x86: dct-test: fix compilation for prores
When the decoder is deactivated, the x86-optimized versions are
not compiled, resulting in a link error.
The C version is unaffected, as it is part of the idctdsp
subsystem.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Tue, 10 Mar 2015 23:11:52 +0000 (23:11 +0000)]
x86: xvid_idct: port MMX iDCT to yasm
Also reduce the table duplication with SSE2 code, remove duplicated
macro parameters.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andreas Cadhalpun [Fri, 13 Mar 2015 21:28:42 +0000 (22:28 +0100)]
ac3dec_fixed: always use the USE_FIXED=1 variant of the AC3DecodeContext
The AC3DecodeContext has a float (USE_FIXED=0) and an integer
(USE_FIXED=1) variant, both of which can be present in the same binary.
This is not only very confusing, but it also breaks horribly, when one
variant is used by code expecting the other.
This currently happens, because
eac3dec.c is only compiled for the float
variant, but also used from ac3dec_fixed.c, which uses the integer
variant.
The result is memory corruption, leading to crashes.
So compile
eac3dec.c once for each variant and adapt it, so that it
works with the integer variant.
A loss of precission and scaling bug has been fixed by the committer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 14 Mar 2015 00:15:37 +0000 (01:15 +0100)]
swresample/resample: Fix undefined shifts
Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 13 Mar 2015 21:28:25 +0000 (22:28 +0100)]
avcodec/utils: use atomic operations on entangled_thread_counter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 13 Mar 2015 22:43:24 +0000 (23:43 +0100)]
configure: fix zlib dependancy of tdsc
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 13 Mar 2015 22:18:12 +0000 (23:18 +0100)]
avcodec/tdsc: use ff_codec_open2_recursive()
Fixes assertion failure and race conditions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 13 Mar 2015 22:17:54 +0000 (23:17 +0100)]
Merge commit '
247e370e2a913db52ca079b347a174c8d393b171'
* commit '
247e370e2a913db52ca079b347a174c8d393b171':
TDSC decoder
Conflicts:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/version.h
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 13 Mar 2015 21:48:54 +0000 (22:48 +0100)]
Merge commit '
5a0e953c2465be9d449d5f523c3d3e2b886910b2'
* commit '
5a0e953c2465be9d449d5f523c3d3e2b886910b2':
mjpeg: Mark decoder family as thread safe
Conflicts:
libavcodec/mjpegbdec.c
libavcodec/mjpegdec.c
libavcodec/mxpegdec.c
libavcodec/sp5xdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 13 Mar 2015 21:20:17 +0000 (22:20 +0100)]
Merge commit '
117b432748ca87de4cd0f09d9b1495545e264733'
* commit '
117b432748ca87de4cd0f09d9b1495545e264733':
lavc: Introduce AVCodec internal capabilities
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 13 Mar 2015 21:02:19 +0000 (22:02 +0100)]
Merge commit '
9993a067f6c8c7e7838052ac3146aa6b80dd7e81'
* commit '
9993a067f6c8c7e7838052ac3146aa6b80dd7e81':
lavc: Improve thread locking error message
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Wed, 11 Mar 2015 20:44:00 +0000 (20:44 +0000)]
TDSC decoder
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Vittorio Giovara [Wed, 11 Mar 2015 20:43:59 +0000 (20:43 +0000)]
mjpeg: Mark decoder family as thread safe
No global variables are used and the VLC tables are allocated without
static elements. This will allow using a JPEG decoding context within
other decoders.
Vittorio Giovara [Wed, 11 Mar 2015 20:43:58 +0000 (20:43 +0000)]
lavc: Introduce AVCodec internal capabilities
This field is designed for marking codec properties useful to lavc internals.
Two internal capabilities are added:
- FF_CODEC_CAP_INIT_THREADSAFE: codec can be opened without locks;
- FF_CODEC_CAP_INIT_CLEANUP: codec frees memory if initialization fails.
Vittorio Giovara [Wed, 11 Mar 2015 20:43:57 +0000 (20:43 +0000)]
lavc: Improve thread locking error message
Zhang Rui [Thu, 12 Mar 2015 03:39:55 +0000 (11:39 +0800)]
avformat/http: support auto reconnect
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 13 Mar 2015 15:25:27 +0000 (16:25 +0100)]
avformat/flvdec: add support for OnCaption
Michael Niedermayer [Tue, 20 Jan 2015 22:56:17 +0000 (23:56 +0100)]
avformat/flvdec: re enable flv_data_packet()
Found-by: kurosu
Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 13 Mar 2015 15:00:53 +0000 (16:00 +0100)]
avformat/flvdec: Change subtitle stream type to subtitle type
Previous-version-reviewed-by: Andreas Cadhalpun
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 13 Mar 2015 03:46:44 +0000 (04:46 +0100)]
avcodec/svq1dec: Fix undefined shifts
Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Fri, 13 Mar 2015 07:52:36 +0000 (08:52 +0100)]
lavc: Print number of reference frames if debug level >= verbose.
Carl Eugen Hoyos [Fri, 13 Mar 2015 07:49:03 +0000 (08:49 +0100)]
lavf: Do not list mov-only codecs in riff.c.
Instead check for all mov code-points when demuxing avi
and print a warning if a video codec is found like this.
Fixes a regression similar to the one described in ticket #4307.
Carl Eugen Hoyos [Fri, 13 Mar 2015 00:57:42 +0000 (01:57 +0100)]
doc: Fix alphabetic ordering for decklink input device.
Christophe Gisquet [Tue, 10 Mar 2015 23:11:51 +0000 (23:11 +0000)]
x86: xvid_idct: port SSE2 iDCT to yasm
The main difference consists in renaming properly labels, and
letting yasm select the gprs for skipping 1D transforms.
Previous-version-reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 12 Mar 2015 23:02:18 +0000 (00:02 +0100)]
Merge commit '
913aa9a4874418724183a3ec862cdc63b829367d'
* commit '
913aa9a4874418724183a3ec862cdc63b829367d':
libx264: Return more meaningful error codes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 12 Mar 2015 22:50:41 +0000 (23:50 +0100)]
Merge commit '
6bdae41d3ef74a0865e8f87896e649f93b2f39bd'
* commit '
6bdae41d3ef74a0865e8f87896e649f93b2f39bd':
matroskadec: Check memory allocations
Conflicts:
libavformat/matroskadec.c
See:
3e2a5b33f0355eeb80b6b2805be7f1b4fa1d1a46
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 12 Mar 2015 21:39:27 +0000 (22:39 +0100)]
Merge commit '
c3bd1d60af97e8d2568dac9fcce7bdabb4ff93c8'
* commit '
c3bd1d60af97e8d2568dac9fcce7bdabb4ff93c8':
formats: Check memory allocations
Conflicts:
libavfilter/formats.c
See:
527ca3985c736ffe077a82fdf3616f0fd571b923
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 12 Mar 2015 20:58:38 +0000 (21:58 +0100)]
Merge commit '
5a2645cafeca1c2207ac55cc831c3349572a82ed'
* commit '
5a2645cafeca1c2207ac55cc831c3349572a82ed':
nutdec: Prevent leaks on memory error
Conflicts:
libavformat/nutdec.c
See:
269845db86d994c7d43c3ad6eabd4fde5bb391ea
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 12 Mar 2015 20:50:36 +0000 (21:50 +0100)]
Merge commit '
edca1dd552efa1ebef016ca9eff4ce6757605819'
* commit '
edca1dd552efa1ebef016ca9eff4ce6757605819':
xcbgrab: Check av_strdup() allocation
Conflicts:
libavdevice/xcbgrab.c
See:
db442c873631065e8719df6da91c016d25501084
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 12 Mar 2015 20:38:47 +0000 (21:38 +0100)]
Merge commit '
17c45d4d056d0e10ecb88b424ec9e68be398da5e'
* commit '
17c45d4d056d0e10ecb88b424ec9e68be398da5e':
libtheora: Check frame allocation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 12 Mar 2015 20:30:37 +0000 (21:30 +0100)]
Merge commit '
a72d93daa09ffbad2771f1450820941055eaf210'
* commit '
a72d93daa09ffbad2771f1450820941055eaf210':
mpegvideo_enc: Check AVCodecContext allocation
Conflicts:
libavcodec/mpegvideo_enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 12 Mar 2015 20:20:20 +0000 (21:20 +0100)]
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>
James Almer [Thu, 12 Mar 2015 18:35:05 +0000 (15:35 -0300)]
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>
Himangi Saraogi [Thu, 12 Mar 2015 16:20:13 +0000 (21:50 +0530)]
libx264: Return more meaningful error codes
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Vittorio Giovara [Thu, 12 Mar 2015 13:04:09 +0000 (13:04 +0000)]
matroskadec: Check memory allocations
CC: libav-stable@libav.org
Vittorio Giovara [Thu, 12 Mar 2015 15:34:32 +0000 (15:34 +0000)]
formats: Check memory allocations
James Cowgill [Wed, 11 Mar 2015 14:59:28 +0000 (14:59 +0000)]
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>
Vittorio Giovara [Wed, 11 Mar 2015 19:24:59 +0000 (19:24 +0000)]
nutdec: Prevent leaks on memory error
Bug-Id: CID 205122 / CID 205123
Vittorio Giovara [Wed, 11 Mar 2015 19:25:01 +0000 (19:25 +0000)]
xcbgrab: Check av_strdup() allocation
Bug-Id: CID
1274038
Vittorio Giovara [Thu, 12 Mar 2015 12:34:52 +0000 (12:34 +0000)]
libtheora: Check frame allocation
Vittorio Giovara [Wed, 11 Mar 2015 19:46:29 +0000 (19:46 +0000)]
mpegvideo_enc: Check AVCodecContext allocation
Michael Niedermayer [Thu, 12 Mar 2015 01:01:33 +0000 (02:01 +0100)]
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>
Michael Niedermayer [Thu, 12 Mar 2015 00:49:48 +0000 (01:49 +0100)]
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>
Rainer Hochecker [Thu, 12 Mar 2015 13:08:25 +0000 (14:08 +0100)]
hevc: delay ff_thread_finish_setup for hwaccel
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Niels Möller [Thu, 12 Mar 2015 12:26:40 +0000 (13:26 +0100)]
dca: Document the permuted order in the lfe_fir_64 and lfe_fir_128 tables
Michael Niedermayer [Thu, 12 Mar 2015 11:37:13 +0000 (12:37 +0100)]
Merge commit '
b97f427fb56bdbf7de8e2d4b72d01114aa6eceda'
* commit '
b97f427fb56bdbf7de8e2d4b72d01114aa6eceda':
lavf: Explicitly convert types at function pointer assignment
Conflicts:
libavformat/avio.c
libavformat/aviobuf.c
libavformat/swfenc.c
See:
a76a2ffe9d7773d59bb1bc228a6660e23672c490 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 12 Mar 2015 11:25:29 +0000 (12:25 +0100)]
Merge commit '
9c8074050745184a61059ad56045ad711299e33d'
* commit '
9c8074050745184a61059ad56045ad711299e33d':
configure: Mark qsv subsystem as not selectable on the command line
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Yayoi [Tue, 10 Mar 2015 05:01:47 +0000 (22:01 -0700)]
avfilter/colormatrix:add slice threading
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 14 Jan 2015 23:42:55 +0000 (00:42 +0100)]
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>
Michael Niedermayer [Wed, 14 Jan 2015 23:42:55 +0000 (00:42 +0100)]
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>
Michael Niedermayer [Wed, 11 Mar 2015 23:31:20 +0000 (00:31 +0100)]
Merge commit '
67142a8c721c7916c9ad2eb439c14d567aeb88c1'
* commit '
67142a8c721c7916c9ad2eb439c14d567aeb88c1':
roqvideoenc: set enc->avctx in roq_encode_init
See:
cf82c426fadf90105e1fb9d5ecd267cc3aa2b288
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 11 Mar 2015 23:23:28 +0000 (00:23 +0100)]
Merge commit '
72211a2af0470799c9611b9c1c7039ab14a34a0a'
* commit '
72211a2af0470799c9611b9c1c7039ab14a34a0a':
asfenc: fix leaking asf->index_ptr on error
See:
2c8cff2be4a044c66e4904efa156dafd0d332d25
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 11 Mar 2015 23:14:43 +0000 (00:14 +0100)]
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>
Diego Biurrun [Tue, 10 Feb 2015 15:02:30 +0000 (16:02 +0100)]
lavf: Explicitly convert types at function pointer assignment
This fixes a number of "assignment from incompatible pointer type" warnings.
Diego Biurrun [Wed, 11 Mar 2015 09:39:26 +0000 (10:39 +0100)]
configure: Mark qsv subsystem as not selectable on the command line
Michael Niedermayer [Wed, 11 Mar 2015 19:38:08 +0000 (20:38 +0100)]
Merge commit '
7a76c6c4df31d1ff65464ccf3171acd57ef004eb'
* commit '
7a76c6c4df31d1ff65464ccf3171acd57ef004eb':
configure: Enable colored output for gcc 4.9+
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 11 Mar 2015 19:28:36 +0000 (20:28 +0100)]
Merge commit '
bacc92b59bfa5d6a1f631e63e46fc1d2fb934e51'
* commit '
bacc92b59bfa5d6a1f631e63e46fc1d2fb934e51':
rtpdec_vp9: Drop extra sanity check for size of input packet
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Andreas Cadhalpun [Mon, 9 Mar 2015 18:24:09 +0000 (19:24 +0100)]
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>
Andreas Cadhalpun [Mon, 9 Mar 2015 18:31:39 +0000 (19:31 +0100)]
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>
Michael Niedermayer [Wed, 11 Mar 2015 19:17:40 +0000 (20:17 +0100)]
Michael Niedermayer [Wed, 11 Mar 2015 19:09:18 +0000 (20:09 +0100)]
Merge commit '
9272c965d9559a90ee64d46aebd99c117e07f7a3'
* commit '
9272c965d9559a90ee64d46aebd99c117e07f7a3':
matroskaenc: Fix type used for chapter timestamps
Conflicts:
libavformat/matroskaenc.c
See:
a4cd057bc7ddd2dd094d2ae7b0d6843ade95a626
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 11 Mar 2015 18:58:43 +0000 (19:58 +0100)]
Merge commit '
dc2d0e06af459af9a7f91b65e0a3119acc4f1baa'
* commit '
dc2d0e06af459af9a7f91b65e0a3119acc4f1baa':
mlpdec: support TrueHD streams with an Atmos substream
See:
36bf549b2706bd10014556a84a33ed6daf5d5373
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 11 Mar 2015 18:50:08 +0000 (19:50 +0100)]
Merge commit '
f36f6a608b5b2c17f8876195c61621c8f8607cee'
* commit '
f36f6a608b5b2c17f8876195c61621c8f8607cee':
mlpdec: support major sync headers with optional extension blocks
See:
ff34b2d6d35b212523428b9b932cce4914f7ac03
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Yukinori Yamazoe [Wed, 11 Mar 2015 09:04:30 +0000 (18:04 +0900)]
qsv: Improve the log message of when initializing MFX_IMPL_HARDWARE{2, 3, 4}
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Wed, 11 Mar 2015 18:03:16 +0000 (19:03 +0100)]
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>
Vittorio Giovara [Mon, 9 Mar 2015 01:02:01 +0000 (01:02 +0000)]
configure: Enable colored output for gcc 4.9+
Vittorio Giovara [Mon, 9 Mar 2015 17:27:22 +0000 (17:27 +0000)]
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
Vittorio Giovara [Mon, 9 Mar 2015 23:02:00 +0000 (23:02 +0000)]
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
Michael Niedermayer [Wed, 11 Mar 2015 17:49:57 +0000 (18:49 +0100)]
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>
Vittorio Giovara [Wed, 11 Mar 2015 14:56:52 +0000 (14:56 +0000)]
matroskaenc: Fix type used for chapter timestamps
Michael Niedermayer [Wed, 11 Mar 2015 16:59:59 +0000 (17:59 +0100)]
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>
Michael Niedermayer [Wed, 11 Mar 2015 15:55:07 +0000 (16:55 +0100)]
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>
Michael Niedermayer [Wed, 11 Mar 2015 15:47:13 +0000 (16:47 +0100)]
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>
Michael Niedermayer [Wed, 11 Mar 2015 15:28:06 +0000 (16:28 +0100)]
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>
Hendrik Leppkes [Fri, 26 Sep 2014 11:49:21 +0000 (13:49 +0200)]
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>
Hendrik Leppkes [Fri, 26 Sep 2014 11:49:20 +0000 (13:49 +0200)]
mlpdec: support major sync headers with optional extension blocks
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Wed, 11 Mar 2015 14:40:28 +0000 (15:40 +0100)]
swscale/utils: Fix undefined shift in initFilter()
Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 11 Mar 2015 12:32:08 +0000 (13:32 +0100)]
avcodec/wma: Fix undefined shift in ff_wma_run_level_decode()
Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 11 Mar 2015 12:16:47 +0000 (13:16 +0100)]
avcodec/vc1_pred: Fix undefined shift in ff_vc1_pred_mv()
Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 11 Mar 2015 03:24:57 +0000 (04:24 +0100)]
avcodec/mpeg12dec: Fix undefined shift
Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Sun, 8 Mar 2015 16:54:25 +0000 (17:54 +0100)]
x86: Makefile: fix DBG parameter evaluation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Florian Jacob [Wed, 11 Mar 2015 00:13:44 +0000 (01:13 +0100)]
lavf/libssh: support reading config from ~/.ssh/config
libssh provides a function for parsing ~/.ssh/config for ssh connection parameters like user, hostname, identity file
and port. This patch makes ffmpeg use this function to take parameters from the config file for everything that's not
explicitely set in the url. It also supports host aliases, i.e. using a shorthand in the url and replacing it with the
hostname / IP address specified for the shorthand in the config file.
Signed-off-by: Florian Jacob <projects+ffmpeg@florianjacob.de>
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Michael Niedermayer [Tue, 10 Mar 2015 18:18:34 +0000 (19:18 +0100)]
avcodec/012v: redesign main loop
Fixes out of array accesses
Fixes: ffmpeg_012v_crash.ts
Found-by: Thomas Lindroth <thomas.lindroth@gmail.com>
Reviewed-by: Thomas Lindroth <thomas.lindroth@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Tue, 10 Mar 2015 21:55:30 +0000 (22:55 +0100)]
lavfi/boxblur: Fix colourpsace list.
Fixes ticket #4363.
Michael Niedermayer [Tue, 10 Mar 2015 20:15:05 +0000 (21:15 +0100)]
avcodec/h264: Fix undefined shifts in pack16to32() and pack8to16()
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 10 Mar 2015 20:15:05 +0000 (21:15 +0100)]
avcodec/mpegvideo: Fix undefined shifts in ff_init_block_index()
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 10 Mar 2015 19:21:14 +0000 (20:21 +0100)]
avcodec/012v: Check dimensions more completely
Fixes division by 0
Found-by: Thomas Lindroth <thomas.lindroth@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>