* commit 'a5a71992':
  mpeg4videoenc: don't set MpegEncContext.resync_marker
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ad09f525':
  h263dec: remove commented out cruft

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

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

* commit 'bc5abfb1':
  mpeg4videodec: move MpegEncContext.rvlc to Mpeg4DecContext
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '9f0617d2':
  mpeg4videodec: remove write-only sprite variables from MpegEncContext
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit '1a890257':
  mpeg4videodec: move MpegEncContext.vol_sprite_usage to Mpeg4DecContext
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '75bd07f7':
  mpeg4videoenc: write 0 instead of vol_sprite_usage
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e62a43f6':
  mpeg4videodec: move MpegEncContext.time_increment_bits to Mpeg4DecContext

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

* commit 'ee8af2dd':
  mpeg4videodec: move MpegEncContext.shape to Mpeg4DecContext

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

* 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>

It is only used in one place immediately after it is set.

That field is never set for encoding.

The field remains in MpegEncContext for use in the encoder.

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>