* commit '51dc4de1':
  rscc: Add extended pixel format support
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is a no-op.

* commit '4c6836db':
  nvenc_h264: Fix name of private AVClass
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'e3453fd4':
  matroska: Write the field order information
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is a no-op. We cherry picked it earlier.

* commit 'b3051a46':
  vaapi_h264: Fix bit offset of slice data.
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '33275a0d':
  ac3dec: change logging of skipped E-AC-3 substreams.
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'fef2147b':
  eac3dec: don't call avpriv_request_sample every frame.
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '1db8eb15':
  avconv: Drop an unused variable
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '6bb99757':
  jack: Support OSX
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '5f022666':
  matroska: Support interlaced content correctly
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '44f05f15':
  build: Do not check the vaapi_encode.h header if VAAPI is not enabled
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'bd016dbf':
  Mark tables used only within their files as static
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '061dc203':
  h264: Add missing ff_ prefix to internally visible h264_init_dequant_tables()
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '69a63801':
  avconv: fix -frames for video
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '83f230c2':
  lavc: VAAPI MJPEG encoder
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '31fe1f25':
  lavc: VAAPI H.265 encoder
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '2c62fcdf':
  lavc: VAAPI H.264 encoder
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '104c804b':
  lavc: VAAPI encode common infrastructure
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '5d273d3e':
  avconv: VAAPI hwcontext initialisation and hwaccel helper
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

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

The problem is that with particularly complex images and especially at
high bit depths and 5-level transforms the coefficients would overflow,
causing huge artifacts to appear. This was discovered thanks to the fate
tests, which will have to be redone as this fixes a multitude of
problems and increases PSNR.

There is a slight performance drop associated with this change, making
the encoder slower by 1.15 times, however this is necessary in order to
avoid undefined behavior and overflows.

It would be worth to template the transforms to keep the performance for
8 bit images as 32 bit coefficients are unnecessary for that case, but
the primary use of the encoder is to encode video at 10 bits.
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>

The GetBitContext now includes the NAL header, which offsets the slice by
one byte, which needs to be accounted for here.

Commit ca2f19b9 modified the meaning of
H264SliceContext.gb: it is now initialised at the start of the NAL unit
header, rather than at the start of the slice header.  The VAAPI slice
decoder uses the offset after parsing to determine the offset of the
slice data in the bitstream, so with the changed meaning we no longer
need to add the extra byte to account for the NAL unit header because
it is now included directly.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Also temporary enable the test so we get updated fate failure statistics

Note, this does not work on all platforms, it fails on MIPS
and ml archives indicate it failed on x86 openbsd with some compilers as well
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

The unique user so far is wmalossless 24bits. The few samples tested show an
order of 8, so more unrolling or an avx2 version do not make sense.

Timings: 68 -> 49 cycles
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

* commit 'ca8c7591':
  intrax8: Remove mpegvideo dependency
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '6ebd06a9':
  intrax8: Drop lots of pointless parentheses
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '9b57995c':
  intrax8: Drop MB emulation code
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '9fa888c0':
  intrax8: Keep a reference to the decoder blocks
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'c2084ffc':
  intrax8: Use the generic horizband function
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'b1268e0f':
  intrax8: Pass macroblock coordinates to ff_intrax8_decode_picture
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'd0540fd0':
  intrax8: Pass macroblock size to ff_intrax8_common_init
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '9f4d9913':
  fate: Add test for WMV2 with jframes
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Avoids extra error checks later on and/or invalid reads.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Fixes AnnexB samples with broken extradata, but proper in-band parameter sets
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'ca2f19b9':
  h264: switch to h2645_parse for NAL parsing
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

This ports the fix from 033a5334 to the new parser module in prepartion
of using it for the h264 decoder.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

When only one sublayer is present, no information is coded. Only when at least two
are present, all 8 sublayers are written.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Replace av_copy_packet and deprecated av_dup_packet by
creating reference using av_packet_ref.
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>