* commit '0d6605c7':
  mxf: Fix a possible leak of extradata

Conflicts:
	libavformat/mxfdec.c

See: b6557080Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '1a4e4ad0':
  mxf: Use av_malloc_array

Conflicts:
	libavformat/mxfdec.c

See: 8ce41721Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f5fbbbc0':
  mxf: Drop unnecessary checks

Conflicts:
	libavformat/mxfdec.c

See: c5714097Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'aa0cb16c':
  mxf: Fix off by one error in d10 aes3 decoding

Conflicts:
	libavformat/mxfdec.c

See: 3be02afbMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '42f91322':
  mxf: Do not use int to check the seek position

Conflicts:
	libavformat/mxfdec.c

See: 007989c7Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd84bd465':
  mxf: Set AV_FIELD_PROGRESSIVE

See: def01739Merged-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/mpegaudiodec_template: decode_frame_mp3on4: conceal errors in decoding instead of discarding data
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/mpegaudiodec_template/mp3on4: check that all channels have been decoded before returnig a frame

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f80bf9a259e_5774_id5_1.mp4
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f3f90a8606a_3018_Sequence_1-Apple_ProRes_422_LT.mov
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

av_reallocp_array does the check already.

Without this fix the last sample was missing from the packet.

Overly large files are to be expected.
Reported-by: Jean-Baptiste Kempf <jb@videolan.org>

Needed for AVC-intra
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

See: IRC log
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

reenable it for for bitexact mode
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

MSE doesnt change for the test as the code only triggers
for very sparse matrixes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

MSE changes from 0.04890000 to 0.02969844
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

no changes in either standard deviation or PSNR is seen in any of the changed fate
cases

MSE changes from 0.05012422 to 0.04890000
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This replaces 64 additions by 8 additions

MSE Changes from 0.04873672 to 0.05012422
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  vf_yadif: Relicense from GPL to LGPL

Conflicts:
	LICENSE
	configure
	libavfilter/vf_yadif.c
	libavfilter/x86/vf_yadif.asm
	libavfilter/x86/vf_yadif_init.c
	libavfilter/yadif.h

See: 194ef56bMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '46bacb5c':
  x86: Consistently use cpu flag detection macros in places that still miss it
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '7151c5d0':
  arm: Use full filenames as multiple inclusion guards
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Robert Krüger <krueger@lesspain.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Revert "avfilter/yadif: Revert "lavfi: convert input/ouput list compound literals to named objects""

This reverts commit 4ef4bb4a.
Signed-off-by: Robert Krüger <krueger@lesspain.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This reverts commit ab00800c.
Signed-off-by: Robert Krüger <krueger@lesspain.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This reverts commit 975110a8.
Signed-off-by: Robert Krüger <krueger@lesspain.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Based on mjpeg code by Thilo Borgmann
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This removes the initialization of 2 unused fields
The change was part of c1868e7e
but wasnt merged as the fields could still be used
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

All copyright holders have agreed to the relicensing.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The check could fail if avio_read() read less than requested
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  lavf: make av_probe_input_buffer more robust

Conflicts:
	libavformat/utils.c

Not merged as it depends on previous buggy changes

See: e74cd2f4706f71da5e9205003c1d8263b54ed3fb
See: ececbedaMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '8b763628':
  lavf: use a fixed width type

Conflicts:
	libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c1868e7e':
  lavf: simplify handling of offset in av_probe_input_buuffer()

Conflicts:
	libavformat/utils.c

The simplification is broken and does not work at least for ffmpeg,
thus this change is not merged.
Merged-by: Michael Niedermayer <michaelni@gmx.at>