* commit '35e0833d':
  mpeg4videodec: add a mpeg4-specific private context.

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

* commit '95fd52c1':
  mxfdec: set extradata size

Conflicts:
	libavformat/mxfdec.c

no change as ffmpeg was not affected by this bug
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

The line setting it was mistakenly removed in
ecf442a5

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

Spotted-by: ubitux

Also add notice about ffmpeg -override_ffserver option.

Also make it accept the more consistent behavior (boolean option set to
true when specified).

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

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

* qatar/master:
  dcadec: add disable_xch private option.

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

* commit '220494ad':
  dcadec: treat all 2-channel modes as Stereo in dca_downmix.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'aaa44d02':
  dca: support mixing LFE in dca_downmix.

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

* commit '149438cf':
  dca: improve default stereo downmix coefficients.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit '44b17d79':
  dca: extract core substream's embedded downmix coeffcient codes, if present.

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

* commit '27245b4e':
  dca: remove embedded downmix coefficient extraction.

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

* commit 'b6d5e6aa':
  dca: convert dca_default_coeffs to float.

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

* commit '25609b63':
  dcadec: store the stereo downmix coefficients as float in the DCAContext.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '89de5157':
  dcadec: implement request_channel_layout.

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

It has no effect, and it was never documented.