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>

* commit '97aec6e7':
  fft: arm: Drop unnecessary #include, add missing ones
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '73ff983e':
  fft: x86: cosmetics: Drop silly comments, add comment, whitespace
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'ce9d7da7':
  qsv: Move down the implementation query
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'dbb43b8b':
  avpacket: properly reset data/size in av_packet_move_ref()
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'ba357e98':
  avprobe: switch to codecpar
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

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>

doc/examples/muxing: Add support to pass flags to muxer as since codecpar the codec flags are not available to the muxer anymore
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '567d6d5f':
  avprobe: add local per-stream state
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'c9478410':
  avprobe: add local per-file state
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'c80344d0':
  mpegvideo_enc: use avcodec_free_context() instead of av_free()
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '168a443d':
  avprobe: print information from the codec descriptor
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'e7188a1a':
  avprobe: remove a pointless condition and a dead branch
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>