* commit 'b16e9b9a':
  h264: move initialising the explicit pred weight table for MBAFF
Merged-by: Clément Bœsch <clement@stupeflix.com>

* commit 'b93c0aed':
  h264: drop an outdated comment

This commit is a noop, see 237d31e0Merged-by: Clément Bœsch <clement@stupeflix.com>

* commit '77a1e2c5':
  h264: move direct mode inits out of h264_slice_header_parse()
Merged-by: Clément Bœsch <clement@stupeflix.com>

* commit 'd06e4d8a':
  h264: start splitting decode_slice_header()
Merged-by: Clément Bœsch <clement@stupeflix.com>

This should not be needed anymore and simplifies the next merge
Requested-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

This should not be needed anymore and simplifies the next merge
Requested-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Even though this is not part of the public API, some external
applications access fields after it, thus breaking after updating from
ffmpeg 3.0 or earlier.
Since it is not public, it can be freely moved to the end to avoid
that problem in the future.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>

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

* commit '2940e196':
  vaapi_h265: cu_qp_delta should not be used in constant-QP mode
Merged-by: Clément Bœsch <clement@stupeflix.com>

* commit '02fa1ad9':
  vaapi_h264: Add source version identifier as unregistered SEI
Merged-by: Clément Bœsch <clement@stupeflix.com>

* commit '48e2967c':
  vaapi_h264: Add support for SEI messages
Merged-by: Clément Bœsch <clement@stupeflix.com>

* commit '19d7667a':
  vaapi_encode: Add support for writing arbitrary additional packed headers
Merged-by: Clément Bœsch <clement@stupeflix.com>

* commit '081961f8':
  vaapi_h264: Add support for VUI parameters
Merged-by: Clément Bœsch <clement@stupeflix.com>

* commit '2e4a7bd5':
  h264: drop unused H264Context.gb
Merged-by: Clément Bœsch <clement@stupeflix.com>

* commit '4f81f8db':
  Drop unnecessary golomb.h #includes
Merged-by: Clément Bœsch <clement@stupeflix.com>

* commit '197ae68e':
  Drop unnecessary unary.h #includes
Merged-by: Clément Bœsch <clement@stupeflix.com>

* commit '6ac52f05':
  dvbsub_parser: Add missing mem.h #include
Merged-by: Clément Bœsch <clement@stupeflix.com>

* commit '81f769fa':
  gsm: Move requant_tab table to the gsm tables file
Merged-by: Clément Bœsch <clement@stupeflix.com>

* commit '42dc2143':
  mpc: Drop unused GetBitContext context member
Merged-by: Clément Bœsch <clement@stupeflix.com>

* commit '85b8403c':
  svq1enc: Drop unused GetBitContext context member
Merged-by: Clément Bœsch <clement@stupeflix.com>

* commit '6d8fd614':
  vorbis: Kill some pointless debug code
Merged-by: Clément Bœsch <clement@stupeflix.com>

* commit '59c6509d':
  mss2: Drop a silly assert
Merged-by: Clément Bœsch <clement@stupeflix.com>

This was mentioned to be in ae753dbd but
actually wasn't.

* commit 'b6686629':
  get_bits: Move BITSTREAM_READER_LE definition before all relevant #includes

The merge commit also includes changes for libavcodec/interplayacm.c and
libavcodec/truemotion2rt.c
Merged-by: Clément Bœsch <clement@stupeflix.com>

* commit '09c4e5c5':
  indeo2: Drop disabled big-endian ir2_codes table
Merged-by: Clément Bœsch <clement@stupeflix.com>

* commit 'b7f98659':
  Remove unnecessary get_bits.h #includes
Merged-by: Clément Bœsch <clement@stupeflix.com>

* commit '2a48a75a':
  sgirledec: simplify, no need to use reget buffer

This commit is a noop, see ccc3f4e7Merged-by: Clément Bœsch <clement@stupeflix.com>

* commit '6e2ad28c':
  aic: add frame threading support

This commit is a noop, see 8e069eb5Merged-by: Clément Bœsch <clement@stupeflix.com>

* commit 'c3ed259e':
  fate: Move Canopus decoder tests to a separate file
Merged-by: Clément Bœsch <clement@stupeflix.com>

Fixes a regression introduced by 0cd5e281.

Fixes integer overflow
Fixes: poc.mp4
Found-by: ajax secure <ajax4sec@hotmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

the result of ffmpeg decoding is binary exact with the yuv output of
official decoder (dwebp)
Signed-off-by: James Almer <jamrial@gmail.com>

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

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

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

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

* commit '20a8c78c':
  avconv: Do not copy extradata if source buffer is empty

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

* commit '38f99017':
  vp9: Return the correct size when decoding a superframe

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

* commit 'b2d5d6a7':
  build: Only enable symbol reduction if the compiler does proper DCE
Merged-by: Clément Bœsch <u@pkh.me>

* commit 'c5fd4b50':
  build: Simplify postprocessing of linker version script files
Merged-by: Clément Bœsch <u@pkh.me>