* commit 'ffa190d0':
  Move VLC and RL_VLC_ELEM structure definitions to a separate header
Merged-by: Clément Bœsch <u@pkh.me>

* commit 'b2361326':
  avconv_dxva2: use the hwcontext API
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

* commit 'c46db38c':
  hwcontext: add a dxva2 implementation
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Fixes Ticket5428
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Fixes regression from Ticket5428
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Based on d338abb6

* commit 'd338abb6':
  mpeg4videodec: Call av_log() in check_marker() with AVCodecContext instead of NULL

This commit is a noop.

Since check_marker() is still in get_bits.h in FFmpeg and shared amongst
decoders, a similar but different change will be committed in the next
commit in to serve the same purpose of this one (that is, passing a
logging context to the av_log() in that function).
Merged-by: Clément Bœsch <u@pkh.me>

* commit 'e4b38878':
  Move check_marker() from get_bits to mpeg4videodec

Not merged, check_marker() is used in various other places in FFmpeg.
Merged-by: Clément Bœsch <u@pkh.me>

* commit '31f6a4b4':
  lavc: mark the old audio/video encoding API as deprecated
Merged-by: Clément Bœsch <u@pkh.me>

* commit '2fb1d17a':
  x86inc: Enable AVX emulation in additional cases

This commit is a noop, see e428f3b3Merged-by: Clément Bœsch <u@pkh.me>

* commit '300fb0df':
  x86inc: Improve handling of %ifid with multi-token parameters

This commit is a noop, see 4bd5583aMerged-by: Clément Bœsch <u@pkh.me>

* commit '8d02579f':
  x86inc: Fix AVX emulation of some instructions

This commit is a noop, see 42be240aMerged-by: Clément Bœsch <u@pkh.me>

* commit 'ba3eb745':
  x86inc: Fix AVX emulation of scalar float instructions

This commit is a noop, see 8dd3ee9dMerged-by: Clément Bœsch <u@pkh.me>

* commit '8996515b':
  avpacket: fix setting AVPacket.data in av_packet_ref()

This commit is a noop, see ed3a0254Merged-by: Clément Bœsch <u@pkh.me>

* commit 'e62ff72f':
  lavc: make avcodec_open2() fail when the timebase is not set for encoding
Merged-by: Clément Bœsch <u@pkh.me>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '11de006b':
  Combine deprecation guards where appropriate
Merged-by: Clément Bœsch <clement@stupeflix.com>

The internal avctx bitrate is copied into codecpar after estimate_timings()

Fixes Ticket5646
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

* commit 'a6a750c7':
  tests: Move all test programs to a subdirectory
Merged-by: Clément Bœsch <clement@stupeflix.com>

SegmentUID is not a supported element in WebM. See:
http://www.webmproject.org/docs/container/#SegmentUIDReviewed-by: Dave Rice <dave@dericed.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '257f00ec':
  Split global .gitignore file into per-directory files
Merged-by: Clément Bœsch <clement@stupeflix.com>

Unused since a7b8a6e7

* commit '763d69bf':
  Add some more deprecation guards

- psnr() deprecation is not merged within ffmpeg.c as we still use it in
  non-deprecated code

- the XVMC chunk is not merged as we still apparently maintain it

- The guarding in lavc/qtrleenc.c could be simplified but merged anyway.
Merged-by: Clément Bœsch <clement@stupeflix.com>

Fixes properly ticket #5638.

Since 772ad714 PPS and SPS contain the
nal type byte.

This reverts commit b8d754c5.
This reverts commit 8e47a99f.

Fixes part of Ticket5648
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Fixes part of Ticket5648
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

* commit 'b7e64fba':
  Reduce the scope of some variables
Merged-by: Clément Bœsch <u@pkh.me>

* commit 'bc2a3296':
  rtsp: Parse SSRC attributes in the SDP
Merged-by: Clément Bœsch <u@pkh.me>

* commit '9ea78fd0':
  rtpdec: Always check if we have the next packet queued
Merged-by: Clément Bœsch <u@pkh.me>

* commit '0c1d66a0':
  avconv_vaapi: fix double-free with some unsupported streams
Merged-by: Clément Bœsch <u@pkh.me>

* commit '885a9d60':
  pgssub: Fix subpicture colorspace and range

See 9779b626Merged-by: Clément Bœsch <u@pkh.me>

* commit '1f77e634':
  colorspace: Add support for BT709

See 9779b626Merged-by: Clément Bœsch <u@pkh.me>

* commit '283226e1':
  simple_idct_template: Fix strict aliasing violation

See 5df703aaMerged-by: Clément Bœsch <u@pkh.me>