ffmpeg.git
5 years agoavformat/avidec: use avpriv_find_start_code in avi_read_packet()
zhaoxiu.zeng [Sun, 15 Mar 2015 08:38:27 +0000 (16:38 +0800)]
avformat/avidec: use avpriv_find_start_code in avi_read_packet()

Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/ac3: Fix undefined shift in ff_ac3_bit_alloc_calc_mask()
Michael Niedermayer [Sun, 15 Mar 2015 10:21:50 +0000 (11:21 +0100)]
avcodec/ac3: Fix undefined shift in ff_ac3_bit_alloc_calc_mask()

Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/ac3dec: Fix undefined shifts
Michael Niedermayer [Wed, 11 Mar 2015 15:21:26 +0000 (16:21 +0100)]
avcodec/ac3dec: Fix undefined shifts

Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/vc1: Fix undefined shifts
Michael Niedermayer [Sun, 15 Mar 2015 01:57:24 +0000 (02:57 +0100)]
avcodec/vc1: Fix undefined shifts

Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoRevert "ppc: lavc: use LOCAL_ALIGNED instead of DECLARE_ALIGNED"
Michael Niedermayer [Sun, 15 Mar 2015 01:02:21 +0000 (02:02 +0100)]
Revert "ppc: lavc: use LOCAL_ALIGNED instead of DECLARE_ALIGNED"

This broke build, note, LOCAL_ALIGNED_16() does not work either

Found-by: James Almer <jamrial@gmail.com>
This reverts commit 98cccdd91c9aab9e031753f6feb81be0c44a9c8e.

5 years agoavcodec/utils: mark codec argument as const in ff_lock_avcodec()
Michael Niedermayer [Sat, 14 Mar 2015 22:30:16 +0000 (23:30 +0100)]
avcodec/utils: mark codec argument as const in ff_lock_avcodec()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavformat/mxfdec: export user comments metadata
Mark Reid [Sat, 14 Mar 2015 01:58:38 +0000 (18:58 -0700)]
libavformat/mxfdec: export user comments metadata

Previous-revision-reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mov: Check for string truncation in mov_open_dref()
Michael Niedermayer [Sat, 14 Mar 2015 20:24:54 +0000 (21:24 +0100)]
avformat/mov: Check for string truncation in mov_open_dref()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mov: Use sizeof(filename) instead of a literal number
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>
5 years agolavc: use LOCAL_ALIGNED instead of DECLARE_ALIGNED
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>
5 years agox86: lavc: use LOCAL_ALIGNED instead of DECLARE_ALIGNED
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>
5 years agoppc: lavc: use LOCAL_ALIGNED instead of DECLARE_ALIGNED
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>
5 years agoppc: libswscale: use LOCAL_ALIGNED instead of DECLARE_ALIGNED
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>
5 years agoavcodec/wmadec: Fix undefined shift in wma_decode_block()
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>
5 years agoac3dec: cosmetics
Christophe Gisquet [Sat, 14 Mar 2015 11:49:00 +0000 (11:49 +0000)]
ac3dec: cosmetics

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoeac3dec: fix scaling
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>
5 years agoac3_fixed: fix computation of spx_noise_blend
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>
5 years agoac3_fixed: fix out-of-bound read
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>
5 years agox86: xvid_idct: SSE2 merged add version
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>
5 years agox86: xvid_idct: merged idct_put SSE2 versions
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>
5 years agox86: dct-test: evaluate prores idct avx version
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>
5 years agox86: dct-test: fix compilation for prores
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>
5 years agox86: xvid_idct: port MMX iDCT to yasm
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>
5 years agoac3dec_fixed: always use the USE_FIXED=1 variant of the AC3DecodeContext
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>
5 years agoswresample/resample: Fix undefined shifts
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>
5 years agoavcodec/utils: use atomic operations on entangled_thread_counter
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>
5 years agoconfigure: fix zlib dependancy of tdsc
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>
5 years agoavcodec/tdsc: use ff_codec_open2_recursive()
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>
5 years agoMerge commit '247e370e2a913db52ca079b347a174c8d393b171'
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>
5 years agoMerge commit '5a0e953c2465be9d449d5f523c3d3e2b886910b2'
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>
5 years agoMerge commit '117b432748ca87de4cd0f09d9b1495545e264733'
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>
5 years agoMerge commit '9993a067f6c8c7e7838052ac3146aa6b80dd7e81'
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>
5 years agoTDSC decoder
Vittorio Giovara [Wed, 11 Mar 2015 20:44:00 +0000 (20:44 +0000)]
TDSC decoder

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agomjpeg: Mark decoder family as thread safe
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.

5 years agolavc: Introduce AVCodec internal capabilities
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.

5 years agolavc: Improve thread locking error message
Vittorio Giovara [Wed, 11 Mar 2015 20:43:57 +0000 (20:43 +0000)]
lavc: Improve thread locking error message

5 years agoavformat/http: support auto reconnect
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>
5 years agoavformat/flvdec: add support for OnCaption
Michael Niedermayer [Fri, 13 Mar 2015 15:25:27 +0000 (16:25 +0100)]
avformat/flvdec: add support for OnCaption

5 years agoavformat/flvdec: re enable flv_data_packet()
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>
5 years agoavformat/flvdec: Change subtitle stream type to subtitle type
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>
5 years agoavcodec/svq1dec: Fix undefined shifts
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>
5 years agolavc: Print number of reference frames if debug level >= verbose.
Carl Eugen Hoyos [Fri, 13 Mar 2015 07:52:36 +0000 (08:52 +0100)]
lavc: Print number of reference frames if debug level >= verbose.

5 years agolavf: Do not list mov-only codecs in riff.c.
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.

5 years agodoc: Fix alphabetic ordering for decklink input device.
Carl Eugen Hoyos [Fri, 13 Mar 2015 00:57:42 +0000 (01:57 +0100)]
doc: Fix alphabetic ordering for decklink input device.

5 years agox86: xvid_idct: port SSE2 iDCT to yasm
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>
5 years agoMerge commit '913aa9a4874418724183a3ec862cdc63b829367d'
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>
5 years agoMerge commit '6bdae41d3ef74a0865e8f87896e649f93b2f39bd'
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>
5 years agoMerge commit 'c3bd1d60af97e8d2568dac9fcce7bdabb4ff93c8'
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>
5 years agoMerge commit '5a2645cafeca1c2207ac55cc831c3349572a82ed'
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>
5 years agoMerge commit 'edca1dd552efa1ebef016ca9eff4ce6757605819'
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>
5 years agoMerge commit '17c45d4d056d0e10ecb88b424ec9e68be398da5e'
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>
5 years agoMerge commit 'a72d93daa09ffbad2771f1450820941055eaf210'
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>
5 years agoMerge commit '78c892284150e12f6b08b287bdf7e62307c6985f'
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>
5 years agohevcdsp: fix compilation for arm and aarch64
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>
5 years agolibx264: Return more meaningful error codes
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>
5 years agomatroskadec: Check memory allocations
Vittorio Giovara [Thu, 12 Mar 2015 13:04:09 +0000 (13:04 +0000)]
matroskadec: Check memory allocations

CC: libav-stable@libav.org
5 years agoformats: Check memory allocations
Vittorio Giovara [Thu, 12 Mar 2015 15:34:32 +0000 (15:34 +0000)]
formats: Check memory allocations

5 years agomips/asmdefs: use _ABI64 as defined by gcc
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>
5 years agonutdec: Prevent leaks on memory error
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

5 years agoxcbgrab: Check av_strdup() allocation
Vittorio Giovara [Wed, 11 Mar 2015 19:25:01 +0000 (19:25 +0000)]
xcbgrab: Check av_strdup() allocation

Bug-Id: CID 1274038

5 years agolibtheora: Check frame allocation
Vittorio Giovara [Thu, 12 Mar 2015 12:34:52 +0000 (12:34 +0000)]
libtheora: Check frame allocation

5 years agompegvideo_enc: Check AVCodecContext allocation
Vittorio Giovara [Wed, 11 Mar 2015 19:46:29 +0000 (19:46 +0000)]
mpegvideo_enc: Check AVCodecContext allocation

5 years agoavcodec/vp9: Fix undefined shifts in decode_frame_header()
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>
5 years agoavcodec/h264_mb: Fix undefined shifts
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>
5 years agohevc: delay ff_thread_finish_setup for hwaccel
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>
5 years agodca: Document the permuted order in the lfe_fir_64 and lfe_fir_128 tables
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

5 years agoMerge commit 'b97f427fb56bdbf7de8e2d4b72d01114aa6eceda'
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>
5 years agoMerge commit '9c8074050745184a61059ad56045ad711299e33d'
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>
5 years agoavfilter/colormatrix:add slice threading
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>
5 years agoavutil/buffer: Avoid moving the AVBufferRef to a new place in memory in av_buffer_mak...
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>
5 years agoavutil/buffer: Avoid moving the AVBufferRef to a new place in memory in av_buffer_rea...
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>
5 years agoMerge commit '67142a8c721c7916c9ad2eb439c14d567aeb88c1'
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>
5 years agoMerge commit '72211a2af0470799c9611b9c1c7039ab14a34a0a'
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>
5 years agoMerge commit '212556cd2144659dc6b9d121ddb38cd272bd10ae'
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>
5 years agolavf: Explicitly convert types at function pointer assignment
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.

5 years agoconfigure: Mark qsv subsystem as not selectable on the command line
Diego Biurrun [Wed, 11 Mar 2015 09:39:26 +0000 (10:39 +0100)]
configure: Mark qsv subsystem as not selectable on the command line

5 years agoMerge commit '7a76c6c4df31d1ff65464ccf3171acd57ef004eb'
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>
5 years agoMerge commit 'bacc92b59bfa5d6a1f631e63e46fc1d2fb934e51'
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>
5 years agoroqvideoenc: set enc->avctx in roq_encode_init
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>
5 years agoasfenc: fix leaking asf->index_ptr on error
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>
5 years agoMerge commit 'fe99c52fa99e44961a09cd1324aefd492b797fc8'
Michael Niedermayer [Wed, 11 Mar 2015 19:17:40 +0000 (20:17 +0100)]
Merge commit 'fe99c52fa99e44961a09cd1324aefd492b797fc8'

* commit 'fe99c52fa99e44961a09cd1324aefd492b797fc8':
  mp3: Properly use AVCodecContext API

Conflicts:
libavformat/mp3dec.c

See: 6ad42b3e15478284321dd285acaf189a16590854
See: b851bc20c6931c084710e69f7eec30d8c1bdb68e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9272c965d9559a90ee64d46aebd99c117e07f7a3'
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>
5 years agoMerge commit 'dc2d0e06af459af9a7f91b65e0a3119acc4f1baa'
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>
5 years agoMerge commit 'f36f6a608b5b2c17f8876195c61621c8f8607cee'
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>
5 years agoqsv: Improve the log message of when initializing MFX_IMPL_HARDWARE{2, 3, 4}
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>
5 years agoavcodec/mpegvideo_motion: Fix undefined shifts in mpeg_motion_internal()
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>
5 years agoconfigure: Enable colored output for gcc 4.9+
Vittorio Giovara [Mon, 9 Mar 2015 01:02:01 +0000 (01:02 +0000)]
configure: Enable colored output for gcc 4.9+

5 years agortpdec_vp9: Drop extra sanity check for size of input packet
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

5 years agomp3: Properly use AVCodecContext API
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
5 years agoavcodec/h264dsp_template: Fix undefined shift in biweight_h264_pixels and weight_h264...
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>
5 years agomatroskaenc: Fix type used for chapter timestamps
Vittorio Giovara [Wed, 11 Mar 2015 14:56:52 +0000 (14:56 +0000)]
matroskaenc: Fix type used for chapter timestamps

5 years agoavcodec/mpegvideo: Fix undefined shift in ff_mpv_lowest_referenced_row()
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>
5 years agoavcodec/vp8: Fix undefined shifts in vp8_mc_luma()
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>
5 years agoavcodec/golomb: Fix undefined shifts in unsigned rice decoding code
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>
5 years agoavcodec/amrnbde: Fix undefined shift in decode_pitch_vector()
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>
5 years agomlpdec: support TrueHD streams with an Atmos substream
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>
5 years agomlpdec: support major sync headers with optional extension blocks
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>
5 years agoswscale/utils: Fix undefined shift in initFilter()
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>
5 years agoavcodec/wma: Fix undefined shift in ff_wma_run_level_decode()
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>
5 years agoavcodec/vc1_pred: Fix undefined shift in ff_vc1_pred_mv()
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>