* qatar/master:
  pcm-dvd: Minor leftovers
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd9cdb7d8':
  pcm-dvd: Support channel configuration changes
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Drop a pointless branch in uninit and use the compact copyright.

The sample buffering logic does not take into account that the blocksize
could change. Reset the buffer if the channel configuration changes,
since if there are leftover samples, it is most likely a broken or
misconcatenated stream. This could lead to negative numbers for
missing_samples during decoding.

Thanks to Michael Niedermeyer for pointing these out.

Its the width in bytes and not the linesize or stride.
This makes the naming more consistent with the rest of the codebase
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This reverts commit 51dab60c.

this fixed nothing, and was just the result of assuming that the
variable named linesize was the linesize. Its not, its the width
in bytes which was already correct.

Found-by: durandal_1707

This is useful in addition to crop=black.
Signed-off-by: Clément Bœsch <clement@stupeflix.com>

Removing the /EXPERIMENTAL suffix for codec id field for Opus. Doing this
as the implementation of embedding Opus in Matroska is complete.

Signed-Off By: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Next release of ffmpeg will support embedding Opus in Matroska
container. Adding that to the Changelog.

Signed-Off By: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* cehoyos/master:
  Set bits_per_raw_sample when reading j2k frames.
  libopenjpegdec.c: Correctly scale gray16 output if precision < 16
  Use rc_max_rate if no video bit_rate was specified when muxing mxf_d10.
  Store the video bit_rate in the context when muxing mxf.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

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

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

avcodec/smacker: use the correct field instead of a hardcoded value for the index check in smacker_decode_tree()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

* qatar/master:
  matroskaenc: Fix stray pointers left over from av_reallocp_array refactoring

Conflicts:
	libavformat/matroskaenc.c

Mostly not merged as the buggy code was no longer part of FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Reflect current code organization.

* commit 'c0779a67':
  mp3: add .mpa extension

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

* commit 'e2cd766c':
  configure: Mention that icl does not build both static and shared libs
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b1e46988':
  g2meet: Allocate cursor buffers large enough to fit the aligned width

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

* commit '0f678c02':
  aic: Validate values read from the bitstream

Conflicts:
	libavcodec/aic.c

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

* commit '17d57848':
  mpc8: Make sure the first stream exists before parsing the seek table

Conflicts:
	libavformat/mpc8.c

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

* commit '459f2b39':
  mpc8: Check the seek table size parsed from the bitstream

Conflicts:
	libavformat/mpc8.c

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

* commit '0d61f260':
  zmbvdec: Check the buffer size for uncompressed data

Conflicts:
	libavcodec/zmbv.c

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

* commit '183b9d84':
  ape: Don't allow the seektable to be omitted

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

* commit 'b26742cc':
  shorten: Break out of loop looking for fmt chunk if none is found

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

* commit '49568851':
  shorten: Use a checked bytestream reader for the wave header

Conflicts:
	libavcodec/shorten.c

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

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

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

* commit 'f3d57dc6':
  smacker: Free memory properly if the init function fails

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

* commit '0679cec6':
  smacker: Make sure we don't fill in huffman codes out of range

Conflicts:
	libavcodec/smacker.c

See: 1285baaa
the added test is redundant but will be used after future refactoring
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd002fce2':
  smacker: Check malloc return values

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