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

* commit 'e9443105':
  avio: Remove a leftover comment
Merged-by: Clément Bœsch <u@pkh.me>

* commit '5afb94c8':
  Mark read-only tables as static
Merged-by: Clément Bœsch <u@pkh.me>

* commit '1f1ad8ac':
  configure: Document --enable-libfontconfig
Merged-by: Clément Bœsch <u@pkh.me>

* commit 'def03d14':
  vf_frei0r: Drop overly verbose and broken debug output
Merged-by: Clément Bœsch <u@pkh.me>

* commit '41ed7ab4':
  cosmetics: Fix spelling mistakes
Merged-by: Clément Bœsch <u@pkh.me>

this removes the need to probe to discover aac streams
inside mpegts containers, thus speeding up initial playback.
Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '5c31eaa9':
  Remove unnecessary get_bits.h #includes and add missing headers where needed.
Merged-by: Clément Bœsch <clement@stupeflix.com>

* commit 'c11c693a':
  h264: Drop broken trace debug output

This commit is not merged as the debug was fixed in
94011f99.
Merged-by: Clément Bœsch <clement@stupeflix.com>

* commit '5f1c3cbd':
  vaapi: Drop pointless debug output
Merged-by: Clément Bœsch <clement@stupeflix.com>

* commit '015c2d92':
  libopencore-amr: Fix ff_dlog()/av_log() invocations

The log changed in our tree in 4a289624
is kept as is since it's the correct thing to do (the log mentions what
the first byte *was*, so it's refering to the source packet, not the
encoded bitstream).
Merged-by: Clément Bœsch <clement@stupeflix.com>

* commit '0f40c909':
  Drop pointless assert.h #includes
Merged-by: Clément Bœsch <clement@stupeflix.com>

* commit '74d98d1b':
  mpegts: Validate the SL Packet Header Configuration

See e630ca51

Our local timestamp_len > 64 is adjusted to > 63 to match the Libav
check and the actual specifications (14496-1, 10.2.2).

There is no need to request a sample as it violates the specifications
and such a file would likely be the result of a crafted/fuzzed sample.

On the other hand, the clipping of the value is kept for extra safety.
Merged-by: Clément Bœsch <clement@stupeflix.com>

Fixes playback of HLS streams on MediaTek devices which requires PPS/SPS
to be set in their respective csd-{0,1} buffers.

* commit '1982d0cc':
  fate: Add test for MTS2/MSS4

The timestamps differ because we use a more appropriate timebase.
Merged-by: Clément Bœsch <clement@stupeflix.com>