* commit '117b4327':
  lavc: Introduce AVCodec internal capabilities

Conflicts:
	libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '9993a067':
  lavc: Improve thread locking error message

Conflicts:
	libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Found-by: kurosu
Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Previous-version-reviewed-by: Andreas Cadhalpun
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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.

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>

* commit '913aa9a4':
  libx264: Return more meaningful error codes
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '6bdae41d':
  matroskadec: Check memory allocations

Conflicts:
	libavformat/matroskadec.c

See: 3e2a5b33Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c3bd1d60':
  formats: Check memory allocations

Conflicts:
	libavfilter/formats.c

See: 527ca398Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '5a2645ca':
  nutdec: Prevent leaks on memory error

Conflicts:
	libavformat/nutdec.c

See: 269845dbMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'edca1dd5':
  xcbgrab: Check av_strdup() allocation

Conflicts:
	libavdevice/xcbgrab.c

See: db442c87Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '17c45d4d':
  libtheora: Check frame allocation
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a72d93da':
  mpegvideo_enc: Check AVCodecContext allocation

Conflicts:
	libavcodec/mpegvideo_enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '78c89228':
  dca: Document the permuted order in the lfe_fir_64 and lfe_fir_128 tables
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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>

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

CC: libav-stable@libav.org

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>

Bug-Id: CID 205122 / CID 205123

Bug-Id: CID 1274038

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>

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>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b97f427f':
  lavf: Explicitly convert types at function pointer assignment

Conflicts:
	libavformat/avio.c
	libavformat/aviobuf.c
	libavformat/swfenc.c

See: a76a2ffe and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '9c807405':
  configure: Mark qsv subsystem as not selectable on the command line
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This allows making a AVBufferRef writable without the need to
update all pointers to it
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This allows reallocating AVBufferRefs without the need to update
all pointers to it
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '67142a8c':
  roqvideoenc: set enc->avctx in roq_encode_init

See: cf82c426Merged-by: Michael Niedermayer <michaelni@gmx.at>