* commit 'aa0cb16c15a5b30f78542f18e3fa65de005cf084':
mxf: Fix off by one error in d10 aes3 decoding
Conflicts:
libavformat/mxfdec.c
See: 3be02afb56f2a485fcdc747b6c2f77ed03adc6e5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '42f9132218ca11a8e9a3c82a175b46bca092113e':
mxf: Do not use int to check the seek position
Conflicts:
libavformat/mxfdec.c
See: 007989c7a2215f54aeaf2393ab3aff0c208e862f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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>
Such files have IndexTableSegments which when parsed cover EditUnit
ranges like this:
[0,1)
[249,250)
[249,377)
[0,249)
where each interval is
[IndexStartPosition, IndexStartPosition + IndexDuration)
This would be reduced to a sparse index like:
[0,1), [249,250)
instead of the full range:
[0,249), [249,377)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
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>
* commit '46bacb5cc6169ff5e8e982495c4925467c1d8bb7':
x86: Consistently use cpu flag detection macros in places that still miss it
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '7151c5d04aed3b496c21f713dcb603e2cbdb9c49':
arm: Use full filenames as multiple inclusion guards
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This reverts commit 4ef4bb4a203e8f472ab0484396270b9430862037.
Signed-off-by: Robert Krüger <krueger@lesspain.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This reverts commit ab00800cde1af1f252731118062dd5149f1a7ed7.
Signed-off-by: Robert Krüger <krueger@lesspain.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This reverts commit 975110a85ef8e794fdc041455ff41b0ad30bc01e.
Signed-off-by: Robert Krüger <krueger@lesspain.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This removes the initialization of 2 unused fields
The change was part of c1868e7ee7b07b40a0fe15f50df89fe499a01a50
but wasnt merged as the fields could still be used
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: ececbedaa86cddd883f6cdc12cdd1a75a0023550
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '8b76362836f3c373c3aadc544522edcbef16dd5f':
lavf: use a fixed width type
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'c1868e7ee7b07b40a0fe15f50df89fe499a01a50':
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>
