* commit '4227e4fe':
  lavf: add a convenience function for adding side data to a stream

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

* commit '728685f3':
  Add a side data type for audio service type.

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/version.h
	libavutil/frame.h
	libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '80a11de7':
  nutenc: do not use has_b_frames

Conflicts:
	libavformat/nutenc.c
	tests/ref/lavf/nut
	tests/ref/seek/lavf-nut

Mostly not merged, this is simply not correct
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e44b5892':
  lavc: deprecate unused AVCodecContext.stream_codec_tag

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

If this causes problems then the stream_codec_tag should be enabled again
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f771b3ab':
  avidec: do not export stream_codec_tag

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

* commit '167e004e':
  h264: drop any pretense of support for data partitioning

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

* commit '58ae8d59':
  h264_parser: restore a comment lost in 0268a54a

Conflicts:
	libavcodec/h264_parser.c

No change, the code that is commented is no longer there in the form to
which the comment applied
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ecab21ac':
  h264: do not reset the ref lists in flush_change()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '9404a47a':
  h264: move parser-only variables to their own context

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

* commit 'cf1e0786':
  error_resilience: move the MECmpContext initialization into ER code

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

* commit 'a7e03804':
  avconv_dxva2: add hevc support

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

* commit '7e850fa6':
  Add DXVA2 HEVC HWAccel

Conflicts:
	configure
	libavcodec/allcodecs.c
	libavcodec/dxva2_hevc.c

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

* commit 'b82722df':
  hevc: reindent after previous commit

Conflicts:
	libavcodec/hevc.c

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

* commit 'e72e8c5a':
  hevc: add hwaccel hooks

Conflicts:
	libavcodec/hevc.c
	libavcodec/hevc_refs.c

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

* commit '4b95e95d':
  hevc: store the short term rps flag and size in the context

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

* commit '36779a84':
  hevc: store the escaped/raw bitstream in HEVCNAL

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

* commit 'b0593a4b':
  hevc: pass the full HEVCNAL struct to decode_nal_unit

Conflicts:
	libavcodec/hevc.c

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

* commit '3a70c0c9':
  examples/transcode_aac: generate proper PTS and set the muxer timebase
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c9b19ac8':
  examples/transcode_aac: fix a typo
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '749a89d1':
  examples/transcode_aac: properly select the output sample format
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '443b7192':
  hevc: unref the current frame if frame_start() fails

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

* commit '1dd02192':
  hevc: clear unused refs on failure
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f9f883af':
  h264: simplify code in flush_dpb()

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

Reviewed-by: compn <tempn@mi.rr.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: Michael Niedermayer <michaelni@gmx.at>

For future use by hardware accelerators.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Hardware Accelerators require access to the escaped bitstream.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Currently, audio service type is a field in AVCodecContext. However,
side data is more appropriate for this kind of information.

It is unreliable, especially when the stream codec context is not the
encoding context. Use the codec descriptor properties instead.

Handle its only existing use case internally.

It does not work correctly and apparently never did. There is no
indication that this (mis)feature is ever used in the wild or even that
any software other than the reference supports it.

Since the code that attempts to support it adds some nontrivial
complexity and has resulted in several bugs in the past, it is better to
just drop it.

They are always constructed anew when needed, so there is no need to
reset them explicitly.