* commit '07a844f3':
  lavfi: generic hardware surface upload and download filters
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '551c6775':
  lavu: VAAPI hwcontext implementation
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'd264c720':
  lavu: deprecate AV_PIX_FMT_VAAPI_*, replace with AV_PIX_FMT_VAAPI
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'b1f01e85':
  lavu: add a way to query hwcontext frame constraints
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '1098f5c0':
  svq3: Use a separate buffer for decoding the slices
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Also, make every addition except for sidedata part of version 1 instead of the
new version 2.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>

Closing single slave operation is pulled out into separate
function close_slave(TeeSlave*).
Both close_slave and close_slaves function are moved before
open_slave function.
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>

Previously, the bug was that if -1 < start_time < 0, the reported
"start" time would lose the negative-sign.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Before it worked for stereo files only.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

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

Signed-off-by: Lou Logan <lou@lrcd.com>
Found-by: furq

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>

This commit is a no-op.

* commit '2f4a1bb9':
  cmdutils: update copyright year to 2016
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is a no-op.

* commit '8b4b1c1e':
  matroska: Support V_QUICKTIME as written in the specification
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '92c1a83e':
  qsv: Fix loading multiple plugins
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '7e01d48c':
  mov: Check the entries value when parsing dref boxes
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '59b9d2f6':
  configure: Add support for clang llvm-cov
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'c11a8586':
  configure: Support msan as toolchain
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '328e9a15':
  buffer: drop a reference to a non-existing function from the docs
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '7480d001':
  pixfmt: fix the AV_PIX_FMT_VAAPI_VLD doxy
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Broke a lot of stuff and didn't fix anything.

This reverts commit 3c461eec, reversing
changes made to 884dd175.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is a no-op. Ours are not identical / refactorable.

* commit '39a2d328':
  mpegvideo: Refactor emulated_edge_mc calls
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '02423513':
  mpegvideo: Fix undefined negative shifts in mpeg_motion_internal
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is a no-op. We solved it already.

* commit '7d4a1ff3':
  mpegvideo: Fix undefined negative shifts in ff_init_block_index
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is a no-op.

* commit '1389b4c1':
  idct8x8: Fix undefined negative shifts
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'e10b7ef2':
  vdpau: Add missing deprecation guards
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'd40cb726':
  mov: Trim dref absolute path
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is a no-op.

[16:15] <@Daemon404> wm4, ping
[16:15] <@Daemon404> whats up with "avconv: remove sub-frame warning"
[16:15] <@Daemon404> it's in libav but not ours?
[16:15] <@Daemon404> mailing list bikeshedding?
[16:15] <@wm4> it's in ffmpeg.c too
[16:16] <@wm4> you can probably skip it for now
[16:16] <@wm4> michaelni was against removing it this way
[16:17] <@Daemon404> ok

* commit '0b6e5d6b':
  avconv: remove sub-frame warning
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is a no-op.

* commit '2e2f8534':
  lavc: factor apply_param_change() AV_EF_EXPLODE handling
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '7a6cf277':
  lavu: improve documentation of some AVFrame functions
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is a no-op.

* commit '84b5dcf2':
  asfenc: remove an unused variable
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is a no-op. As far as I can tell, we already added
checks, to address this CVE in 7c0b84d8,
which is also reflected in the CVE database:

    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-2326

* commit 'ff3db937':
  asfenc: fix some possible integer overflows
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '1ceb07eb':
  avformat_find_stream_info: move duration guessing after updating codec parameters
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '11843ede':
  fate: Add separate target for all indeo3 tests
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'b39ab854':
  fate: Add test for indeo2 with delta frames
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is a no-op. They rewrote fixes we already did,
to the character.

* commit 'f8c34f4b':
  indeo2: Fix banding artefacts
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is a no-op. Ours is already formatted the same.

* commit 'd4066a70':
  indeo2data: K&R formatting cosmetics
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>