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

This commit is a no-op. The value of the refactoring is dubious and
merging it is error prone. If someone feels strongly about merging it,
let me know, and I will.

* commit '1a094af6':
  fft: Split MDCT bits off from FFT
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Fixes decode errors for some AVI files

Fixes initialization errors for some AVI files

Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>

Signed-off-by: James Almer <jamrial@gmail.com>

Suggested & Approved by: BBB
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Tested-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>

It is practical to de-noise only on luma while keeping chroma unchanged.

However, libavfilter/vf_owdenoise.c always do the Wavelet transform/retransform on all 3 channels without check whether chroma_strength is 0.

Thus I make this patch. De-noise on Y only for yuv420 is now 1.5 times faster.
Signed-off-by: Yuuki Galaxy <galaxy001@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Inspired by patch from Martin Vignali.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

The intent here is similar to colormatrix, but it's LGPLv2.1-or-later
(instead of GPLv2.0) and supports gamma/chromaticity correction.

Signed-off-by: James Almer <jamrial@gmail.com>

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

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

The last instance of a missing dec_ctx check from the merge.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Missed it during the merge of ffprobe codecpar conversion.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is a no-op.

* commit '4d13bcce':
  sdp: fix opus sprop-stereo fmtp syntax
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'f6ccee9b':
  fate: fft: Split DCT/FFT/MDCT/RDFT tests into separate targets
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '4c297249':
  rdft: arm: Split RDFT initialization into a separate file
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>