Michael Niedermayer
e3c0fcadda
Merge commit '1a4e4ad0e0c5486dcab05e54b587672a498dd7cf'
...
* commit '1a4e4ad0e0c5486dcab05e54b587672a498dd7cf':
mxf: Use av_malloc_array
Conflicts:
libavformat/mxfdec.c
See: 8ce41721a4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Janne Grunau
d0cd2a8c46
aarch64: bswap inline assembly
...
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
11 years ago
Janne Grunau
032d4da8af
aarch64: configure: set arch dependent features
...
Stack is always 16 byte aligned and clz, 64bit operations and unaligned
memory access are fast in aarch64 mode on ARMv8.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
11 years ago
Janne Grunau
8b4119187b
cabac: remove leftovers from the cabac encoder
...
The cabac encoder was only used by the removed cabac test.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
11 years ago
Michael Niedermayer
84ca7c28ce
Merge commit 'f5fbbbc022f723d3ccf99afd5d658a977b51c08a'
...
* commit 'f5fbbbc022f723d3ccf99afd5d658a977b51c08a':
mxf: Drop unnecessary checks
Conflicts:
libavformat/mxfdec.c
See: c5714097eb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
d938a013af
Merge commit 'aa0cb16c15a5b30f78542f18e3fa65de005cf084'
...
* commit 'aa0cb16c15a5b30f78542f18e3fa65de005cf084':
mxf: Fix off by one error in d10 aes3 decoding
Conflicts:
libavformat/mxfdec.c
See: 3be02afb56
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
1171ad647e
Merge commit '42f9132218ca11a8e9a3c82a175b46bca092113e'
...
* commit '42f9132218ca11a8e9a3c82a175b46bca092113e':
mxf: Do not use int to check the seek position
Conflicts:
libavformat/mxfdec.c
See: 007989c7a2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
8721dda1c5
Merge commit 'd84bd4650b1bed882e2ac1651b4a86206aa0e363'
...
* commit 'd84bd4650b1bed882e2ac1651b4a86206aa0e363':
mxf: Set AV_FIELD_PROGRESSIVE
See: def01739c1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
afbe8c6a84
avcodec/mpegaudiodec_template: decode_frame_mp3on4: conceal errors in decoding instead of discarding data
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
2545182c29
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>
11 years ago
Michael Niedermayer
b2ae92110f
avcodec/flashsv: check avio_read() return in mov_read_udta_string()
...
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>
11 years ago
Tomas Härdin
cc1e3ace63
mxf: Fix potential leak in mxf_read_local_tags()
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
11 years ago
Tomas Härdin
8b708f1c6b
mxf: Correctly support files from Pinnacle Thunder
...
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>
11 years ago
Michael Niedermayer
0d6605c7ef
mxf: Fix a possible leak of extradata
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
11 years ago
Luca Barbato
1a4e4ad0e0
mxf: Use av_malloc_array
11 years ago
Luca Barbato
f5fbbbc022
mxf: Drop unnecessary checks
...
av_reallocp_array does the check already.
11 years ago
Marton Balint
aa0cb16c15
mxf: Fix off by one error in d10 aes3 decoding
...
Without this fix the last sample was missing from the packet.
11 years ago
Luca Barbato
42f9132218
mxf: Do not use int to check the seek position
...
Overly large files are to be expected.
Reported-by: Jean-Baptiste Kempf <jb@videolan.org>
11 years ago
Reimar Döffinger
d84bd4650b
mxf: Set AV_FIELD_PROGRESSIVE
...
Needed for AVC-intra
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
11 years ago
Michael Niedermayer
b821def9f5
avcodec/proresdsp: rename CLIP_AND_BIAS to BANANA
...
See: IRC log
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
cb613657ee
avcodec/x86/proresdsp_init: x86 prores IDCT is bitexact again
...
reenable it for for bitexact mode
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
4b0cad6596
avcodec/simple_idct_template: fix rounding of the special DC case for 10bit
...
MSE doesnt change for the test as the code only triggers
for very sparse matrixes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
a7ea733b72
avcodec/simple_idct_template: fix row rounder
...
MSE changes from 0.04890000 to 0.02969844
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
cca2772e16
avcodec/simple_idct_template: change the idct coefficients so that they match the x86 code
...
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>
11 years ago
Michael Niedermayer
d9e556ebd0
avcodec/proresdsp & idct: move biasing from after the IDCT into the IDCT
...
This replaces 64 additions by 8 additions
MSE Changes from 0.04873672 to 0.05012422
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
12bc33d7cd
Merge remote-tracking branch 'qatar/master'
...
* 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: 194ef56ba7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
b148a39d55
Merge commit '46bacb5cc6169ff5e8e982495c4925467c1d8bb7'
...
* commit '46bacb5cc6169ff5e8e982495c4925467c1d8bb7':
x86: Consistently use cpu flag detection macros in places that still miss it
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
7766c7b7a0
Merge commit '7151c5d04aed3b496c21f713dcb603e2cbdb9c49'
...
* commit '7151c5d04aed3b496c21f713dcb603e2cbdb9c49':
arm: Use full filenames as multiple inclusion guards
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Robert Krüger
194ef56ba7
Change license of yadif from GPL to LGPL
...
Signed-off-by: Robert Krüger <krueger@lesspain.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Robert Krüger
6109399366
Revert "avfilter/yadif: Revert "lavfi: convert input/ouput list compound literals to named objects""
...
This reverts commit 4ef4bb4a20
.
Signed-off-by: Robert Krüger <krueger@lesspain.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Robert Krüger
99c4abfe88
Revert "Revert "yadif: add parens around macro parameters""
...
This reverts commit ab00800cde
.
Signed-off-by: Robert Krüger <krueger@lesspain.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Robert Krüger
4a38eeec38
Revert "Revert "vf_yadif: move x86 init code to x86/yadif.c""
...
This reverts commit 975110a85e
.
Signed-off-by: Robert Krüger <krueger@lesspain.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
James Almer
0b54bc24db
webp: add support for EXIF metadata chunks
...
Based on mjpeg code by Thilo Borgmann
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Andrey Myznikov
b79bccba80
avformat/librtmp: Fix memory leak if RTMP_ConnectStream() fails
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
05c78f345b
avformat/utils: av_probe_input_buffer2 decrease difference to libav
...
This removes the initialization of 2 unused fields
The change was part of c1868e7ee7
but wasnt merged as the fields could still be used
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Robert Krüger
d8e763fda7
vf_yadif: Relicense from GPL to LGPL
...
All copyright holders have agreed to the relicensing.
11 years ago
Diego Biurrun
46bacb5cc6
x86: Consistently use cpu flag detection macros in places that still miss it
11 years ago
Diego Biurrun
7151c5d04a
arm: Use full filenames as multiple inclusion guards
11 years ago
Michael Niedermayer
05886c9d4e
avformat/utils/av_probe_input_buffer2: fix buffer passed to ffio_rewind_with_probe_data()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
8c3b026a0e
avformat/utils/av_probe_input_buffer2: fix offset check
...
The check could fail if avio_read() read less than requested
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
6a2064820b
avformat/utils/av_probe_input_buffer2: Fix pd.buf_size
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
cdce0e8a50
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
lavf: make av_probe_input_buffer more robust
Conflicts:
libavformat/utils.c
Not merged as it depends on previous buggy changes
See: e74cd2f470
See: ececbedaa8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
220f0927b8
Merge commit '8b76362836f3c373c3aadc544522edcbef16dd5f'
...
* commit '8b76362836f3c373c3aadc544522edcbef16dd5f':
lavf: use a fixed width type
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
ececbedaa8
Merge commit 'c1868e7ee7b07b40a0fe15f50df89fe499a01a50'
...
* 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>
11 years ago
Anton Khirnov
2115a35974
lavf: make av_probe_input_buffer more robust
...
Always use the actually read size as the offset instead of making
possibly invalid assumptions.
Addresses: CVE-2012-6618
11 years ago
Anton Khirnov
8b76362836
lavf: use a fixed width type
...
It's shorter and more consistent with the rest of the code.
11 years ago
Anton Khirnov
c1868e7ee7
lavf: simplify handling of offset in av_probe_input_buuffer()
11 years ago
Michael Niedermayer
9ace154186
Merge commit '99e20125232d40ea239a5b54d26bbfe526506114'
...
* commit '99e20125232d40ea239a5b54d26bbfe526506114':
x86/arm: Add clobber tests to libavresample
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
a067445b45
Merge commit '49b9badcaab513b65b79be371b1a9c1012e482ea'
...
* commit '49b9badcaab513b65b79be371b1a9c1012e482ea':
vc1: Enable the interlaced B-frame codepath.
See: 33f2a49423
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
58eb9b9299
Merge commit '6d98959c8a5a749592a878b9523b31eccea5d102'
...
* commit '6d98959c8a5a749592a878b9523b31eccea5d102':
vc1: Add avg_no_rnd_vc1_chroma_mc4_c()
Conflicts:
libavcodec/vc1dsp.c
See: dd6e291e40
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago