* 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, it needs to be initialized by the ER caller (which is
currently either a mpegvideo decoder or h264dec). However, since none of
those decoders use MECmpContext for anything except ER, it makes more
sense to handle it purely inside ER.

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

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

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

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

For future use by hardware accelerators.
Signed-off-by: Anton Khirnov <anton@khirnov.net>

Hardware Accelerators require access to the escaped bitstream.
Signed-off-by: Anton Khirnov <anton@khirnov.net>

This enables decode_nal_unit to access additional fields added in
subsequent commits.
Signed-off-by: Anton Khirnov <anton@khirnov.net>

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

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

Makes the example work with all the supported AAC encoders.
Signed-off-by: Anton Khirnov <anton@khirnov.net>

Prevents DPB from filling up with damaged input.

There is no point in clearing reference explicitly, since that will be
done as a part of ff_h264_unref_picture() right below.

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

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

this makes the static libraries binary reproducible
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Found-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This breaks on BSDs

This reverts commit 7e857cd5.