* qatar/master:
  mpeg: K&R formatting cosmetics

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

* commit '9ecb8587':
  doxy: Format @code blocks so they render properly
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd9ae1031':
  lavf: improve handling of sparse streams when muxing

Conflicts:
	doc/APIchanges
	libavformat/avformat.h
	libavformat/mux.c
	libavformat/options_table.h
	libavformat/version.h

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

* commit '4c3e1956':
  lagarith: reallocate rgb_planes when needed

Conflicts:
	libavcodec/lagarith.c

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

* commit '2240e207':
  truemotion1: check the header size

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

* commit '1713eec2':
  shorten: pad the internal bitstream buffer

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

* commit '54308391':
  eacmv: clear references on frame dimensions change

Conflicts:
	libavcodec/eacmv.c

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

* commit '0e830094':
  samplefmt: avoid integer overflow in av_samples_get_buffer_size()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '190d4a44':
  avcodec: Suppress deprecation warnings from avcodec_alloc_frame()

Conflicts:
	libavcodec/utils.c

No change as we dont call this deprecated function
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd509ae5b':
  jvdec: K&R formatting cosmetics

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

Also adjust header #include order and some comments.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

@code command reports verbatim everything between it and @endcode.
Signed-off-by: Anton Khirnov <anton@khirnov.net>

Currently ff_interleave_packet_per_dts() waits until it gets a frame for
each stream before outputting packets in interleaved order.

Sparse streams (i.e. streams with much fewer packets than the other
streams, like subtitles or audio with DTX) tend to add up latency and in
specific cases end up allocating a large amount of memory.

Emit the top packet from the packet_buffer if it has a time delta
larger than a specified threshold.

Original report of the issue and initial proposed solution by
mus.svz@gmail.com.

Bug-id: 31
Signed-off-by: Anton Khirnov <anton@khirnov.net>

Fixes invalid writes on pixel format changes.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

Fixes invalid reads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

Fixes invalid reads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

Fixes invalid reads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

it should always be 0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

CC:libav-stable@libav.org

* commit '1f097d16':
  h264: reset data partitioning at the beginning of each decode call
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e46ad30a':
  vp8: use a fixed-size edge emu buffer

Conflicts:
	libavcodec/vp8.c
	libavcodec/vp8.h

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

Fixes null pointer dereference
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '33c859c1':
  lavf: ignore attachment streams for interleaving purposes

Conflicts:
	libavformat/avformat.h
	libavformat/internal.h
	libavformat/mux.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '7b03b65b':
  lavf: do basic sanity checking on muxed packets
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '5de64bb3':
  utvideoenc: Add support for the new BT.709 FourCCs for YCbCr
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit 'de203abd':
  vf_overlay: add eof_action switch

Conflicts:
	doc/filters.texi
	libavfilter/vf_overlay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

The function is itself obsolete and slated for removal.

* commit 'b25e84b7':
  hevc: check that the VCL NAL types are the same for all slice segments of a frame
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Diego Biurrun <diego@biurrun.de>

Prevents using GetBitContexts with data from previous calls.

Fixes access to freed memory.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

The reason is the same as for e588615d

Based on a patch by Ronald S. Bultje <rsbultje@gmail.com>

Those streams should never get any packets by definition.

Reject packets for non-existing or attachment streams.

With cli usage the decoder might have not set the colorspace during
encoder init, manual colorspace override might be needed in such
cases.
Signed-off-by: Anton Khirnov <anton@khirnov.net>

Signed-off-by: Anton Khirnov <anton@khirnov.net>

Fixes possible invalid memory access for mismatching skipped/non-skipped
slice segments.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Sample-Id: 00001533-google

avcodec/h264: update current_sps & sps->new only after the whole slice header decoder and init code finished

This avoids them being cleared before the full initialization finished

Fixes out of array read
Fixes: asan_heap-oob_f0c5e6_7071_cov_1605985132_mov_h264_aac__Demo_FlagOfOurFathers.mov
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>