* commit '0bfab80a':
  h264_sei: Group error check outside the switch block

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

* commit '0a49a62f':
  h263: Always check both dimensions

Conflicts:
	libavcodec/ituh263dec.c

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

* commit '6f4cd33e':
  cosmetic: Reformat ff_h263_decode_mba
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e95c7a61':
  mov: Preserve the metadata even when bit-exactness is requested

Conflicts:
	libavformat/movenc.c
	tests/ref/vsynth/vsynth1-mpeg4
	tests/ref/vsynth/vsynth2-mpeg4

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

* commit '303ec065':
  aic: Fix slice size computation for widths multiples of 32 macroblocks
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '3e3056f2':
  h264: Allow stream and container cropping at the same time

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

CC: libav-stable@libav.org
Found-By: ago@gentoo.org

Make sure to not write the custom `encoder` string in that case.

Bug-Id: 845
CC: libav-stable@libav.org

CC: libav-stable@libav.org

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>

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

Signed-off-by: Paul B Mahol <onemda@gmail.com>

* commit '3ad678a8':
  fate: Update ac3 test to the new request_channel_layout option
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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>

Fixes out of array access
Fixes: asan_heap-oob_7f875d_3482_cov_1818465256_ssudec.mov

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes ticket #4689.

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

the max value of the lookup in expanded form is:
(((1 << 7) - 1) << 1) - 65 + 1 + 64 = 254

add one entry of padding to inv_map_table[] to prevent out of bounds
access with non-conforming / fuzzed bitstreams
Signed-off-by: James Zern <jzern@google.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '42bc768e':
  mpegts: Add jpeg2000 stream type

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

* commit '1b4c4684':
  riff: Validate the wav header size before trying to parse it

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

* commit '5bdfc171':
  asf: Do not skip data streams
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Most files use _ instead of - as spacer, so this is more consistent
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

leaving it as asfdec.c confuses git
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: James Almer <jamrial@gmail.com>

Fixes inconsistency and out of array access
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>

Fixes out of array access

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>

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

Previously these chunks where parsed again for each frame with threads
but not without leading to a different path and the potential for
inconsistencies

This also removes a related special case from decode_ihdr_chunk()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This is required by the APNG spec
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Multiple IHDR chunks are forbidden in PNG
Fixes inconsistency and out of array accesses

Fixes: asan_heap-oob_4d5c5a_1738_cov_2638287726_c-m2-8f2b481b7fd9bd745e620b7c01a18df2.png

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

* cehoyos/master:
  lavf/msnwc: Return 0 if the probe function does not detect msnwc-tcp.
  lavf/mpegts: Return 0 if the probe function does not detect mpegts.
  lavf/img2dec: Improve detection of valid Quickdraw images.
  lavf/asfdec: Reduce minimum header size.
  Changelog: Add jpeg 2000 improvements before they get forgotten.
  lavf/img2dec: Autodetect dds frames.

Conflicts:
	libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This commit adds support for the coding of intensity stereo scalefactor indices.
It does not do any marking of such bands and as such does no functional changes
to the encoder. It removes any old twoloop specific code for PNS and moves it
into a seperate function which handles setting of scalefactor indices for
PNS and IS bands.
Reviewed-by: Claudio Freire <klaussfreire@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This was suggested in the discussion about these functions

With this change the functions are available internally but are not
part of the public API
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>