]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Tue, 14 Jan 2014 20:00:58 +0000 (21:00 +0100)]
avcodec/mpegaudiodec_template: decode_frame_mp3on4: conceal errors in decoding instead of discarding data
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 14 Jan 2014 19:53:42 +0000 (20:53 +0100)]
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>
Michael Niedermayer [Tue, 14 Jan 2014 17:27:50 +0000 (18:27 +0100)]
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>
Tomas Härdin [Wed, 24 Oct 2012 14:54:25 +0000 (16:54 +0200)]
mxf: Fix potential leak in mxf_read_local_tags()
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Tomas Härdin [Wed, 4 Apr 2012 12:24:49 +0000 (14:24 +0200)]
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>
Michael Niedermayer [Tue, 11 Dec 2012 13:43:47 +0000 (14:43 +0100)]
mxf: Fix a possible leak of extradata
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Tue, 7 Jan 2014 22:54:09 +0000 (23:54 +0100)]
mxf: Use av_malloc_array
Luca Barbato [Tue, 7 Jan 2014 20:56:33 +0000 (21:56 +0100)]
mxf: Drop unnecessary checks
av_reallocp_array does the check already.
Marton Balint [Wed, 18 Jul 2012 23:23:20 +0000 (01:23 +0200)]
mxf: Fix off by one error in d10 aes3 decoding
Without this fix the last sample was missing from the packet.
Luca Barbato [Tue, 7 Jan 2014 20:26:14 +0000 (21:26 +0100)]
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>
Reimar Döffinger [Thu, 3 Jan 2013 20:42:35 +0000 (21:42 +0100)]
mxf: Set AV_FIELD_PROGRESSIVE
Needed for AVC-intra
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Tue, 14 Jan 2014 15:25:38 +0000 (16:25 +0100)]
avcodec/proresdsp: rename CLIP_AND_BIAS to BANANA
See: IRC log
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 12 Jan 2014 01:28:16 +0000 (02:28 +0100)]
avcodec/x86/proresdsp_init: x86 prores IDCT is bitexact again
reenable it for for bitexact mode
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 12 Jan 2014 01:27:00 +0000 (02:27 +0100)]
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>
Michael Niedermayer [Sun, 12 Jan 2014 01:14:09 +0000 (02:14 +0100)]
avcodec/simple_idct_template: fix row rounder
MSE changes from 0.
04890000 to 0.
02969844
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 12 Jan 2014 00:55:01 +0000 (01:55 +0100)]
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>
Michael Niedermayer [Sun, 12 Jan 2014 00:23:50 +0000 (01:23 +0100)]
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>
Michael Niedermayer [Tue, 14 Jan 2014 13:53:53 +0000 (14:53 +0100)]
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:
194ef56ba7e659196fe554782d797b1b45c3915f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 14 Jan 2014 13:44:53 +0000 (14:44 +0100)]
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>
Michael Niedermayer [Tue, 14 Jan 2014 13:38:05 +0000 (14:38 +0100)]
Merge commit '
7151c5d04aed3b496c21f713dcb603e2cbdb9c49 '
* commit '
7151c5d04aed3b496c21f713dcb603e2cbdb9c49 ':
arm: Use full filenames as multiple inclusion guards
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Robert Krüger [Sat, 4 Jan 2014 13:21:19 +0000 (14:21 +0100)]
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>
Robert Krüger [Sat, 4 Jan 2014 12:50:19 +0000 (13:50 +0100)]
Revert "avfilter/yadif: Revert "lavfi: convert input/ouput list compound literals to named objects""
This reverts commit
4ef4bb4a203e8f472ab0484396270b9430862037 .
Signed-off-by: Robert Krüger <krueger@lesspain.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Robert Krüger [Sat, 4 Jan 2014 12:50:05 +0000 (13:50 +0100)]
Revert "Revert "yadif: add parens around macro parameters""
This reverts commit
ab00800cde1af1f252731118062dd5149f1a7ed7 .
Signed-off-by: Robert Krüger <krueger@lesspain.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Robert Krüger [Sat, 4 Jan 2014 12:49:38 +0000 (13:49 +0100)]
Revert "Revert "vf_yadif: move x86 init code to x86/yadif.c""
This reverts commit
975110a85ef8e794fdc041455ff41b0ad30bc01e .
Signed-off-by: Robert Krüger <krueger@lesspain.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Mon, 13 Jan 2014 04:37:53 +0000 (01:37 -0300)]
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>
Andrey Myznikov [Tue, 14 Jan 2014 00:42:42 +0000 (01:42 +0100)]
avformat/librtmp: Fix memory leak if RTMP_ConnectStream() fails
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 13 Jan 2014 21:37:31 +0000 (22:37 +0100)]
avformat/utils: av_probe_input_buffer2 decrease difference to libav
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>
Robert Krüger [Sun, 5 Jan 2014 18:53:11 +0000 (19:53 +0100)]
vf_yadif: Relicense from GPL to LGPL
All copyright holders have agreed to the relicensing.
Diego Biurrun [Mon, 13 Jan 2014 17:52:32 +0000 (18:52 +0100)]
x86: Consistently use cpu flag detection macros in places that still miss it
Diego Biurrun [Mon, 13 Jan 2014 14:26:16 +0000 (15:26 +0100)]
arm: Use full filenames as multiple inclusion guards
Michael Niedermayer [Mon, 13 Jan 2014 21:17:12 +0000 (22:17 +0100)]
avformat/utils/av_probe_input_buffer2: fix buffer passed to ffio_rewind_with_probe_data()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 13 Jan 2014 21:17:12 +0000 (22:17 +0100)]
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>
Michael Niedermayer [Mon, 13 Jan 2014 21:14:02 +0000 (22:14 +0100)]
avformat/utils/av_probe_input_buffer2: Fix pd.buf_size
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 13 Jan 2014 21:12:38 +0000 (22:12 +0100)]
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:
e74cd2f4706f71da5e9205003c1d8263b54ed3fb
See:
ececbedaa86cddd883f6cdc12cdd1a75a0023550
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 13 Jan 2014 20:34:42 +0000 (21:34 +0100)]
Merge commit '
8b76362836f3c373c3aadc544522edcbef16dd5f '
* commit '
8b76362836f3c373c3aadc544522edcbef16dd5f ':
lavf: use a fixed width type
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 13 Jan 2014 20:18:39 +0000 (21:18 +0100)]
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>
Anton Khirnov [Mon, 13 Jan 2014 12:47:07 +0000 (13:47 +0100)]
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
Anton Khirnov [Mon, 13 Jan 2014 10:56:59 +0000 (11:56 +0100)]
lavf: use a fixed width type
It's shorter and more consistent with the rest of the code.
Anton Khirnov [Mon, 13 Jan 2014 10:55:18 +0000 (11:55 +0100)]
lavf: simplify handling of offset in av_probe_input_buuffer()
Michael Niedermayer [Mon, 13 Jan 2014 13:36:04 +0000 (14:36 +0100)]
Merge commit '
99e20125232d40ea239a5b54d26bbfe526506114 '
* commit '
99e20125232d40ea239a5b54d26bbfe526506114 ':
x86/arm: Add clobber tests to libavresample
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 13 Jan 2014 13:26:33 +0000 (14:26 +0100)]
Merge commit '
49b9badcaab513b65b79be371b1a9c1012e482ea '
* commit '
49b9badcaab513b65b79be371b1a9c1012e482ea ':
vc1: Enable the interlaced B-frame codepath.
See:
33f2a4942380184f3a28cbf2a36366c8ed105232
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 13 Jan 2014 13:18:03 +0000 (14:18 +0100)]
Merge commit '
6d98959c8a5a749592a878b9523b31eccea5d102 '
* commit '
6d98959c8a5a749592a878b9523b31eccea5d102 ':
vc1: Add avg_no_rnd_vc1_chroma_mc4_c()
Conflicts:
libavcodec/vc1dsp.c
See:
dd6e291e4083b7af53968c0ae06330841f63405b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 13 Jan 2014 13:04:48 +0000 (14:04 +0100)]
Merge commit '
c798a6fedc3dd9ed3ac1fb2d95819af58705a87e '
* commit '
c798a6fedc3dd9ed3ac1fb2d95819af58705a87e ':
vc1: Factorize out chroma MC
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Sat, 11 Jan 2014 20:43:26 +0000 (22:43 +0200)]
x86/arm: Add clobber tests to libavresample
Signed-off-by: Martin Storsjö <martin@martin.st>
Tim Walker [Sat, 11 Jan 2014 22:58:16 +0000 (23:58 +0100)]
vc1: Enable the interlaced B-frame codepath.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Thu, 25 Apr 2013 19:31:18 +0000 (21:31 +0200)]
vc1: Add avg_no_rnd_vc1_chroma_mc4_c()
Needed for proper interlaced support.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Sat, 11 Jan 2014 22:59:54 +0000 (23:59 +0100)]
vc1: Factorize out chroma MC
Michael Niedermayer [Mon, 13 Jan 2014 02:51:39 +0000 (03:51 +0100)]
avcodec/hevc: Check entry point arrays for malloc failure
Fixes null pointer dereference
Fixes: signal_sigsegv_e1d3b6_2192_DBLK_F_VIXS_2.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Sun, 12 Jan 2014 00:14:12 +0000 (01:14 +0100)]
hevc: Bound check slice_qp
The T-REC-H.265-
2013044 page 79 states they have to be into the range
[-s->sps->qp_bd_offset, 51].
Fixes: asan_stack-oob_eae8e3_9522_WP_MAIN10_B_Toshiba_3.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Sat, 11 Jan 2014 15:52:43 +0000 (16:52 +0100)]
hevc: Reject impossible dependent tile
The tile 0 cannot depend on a previous one.
Prevent an out of array bound load in ff_hevc_cabac_init().
Fixes: asan_heap-oob_e3a924_1630_DBLK_A_MAIN10_VIXS_2.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Reviewed-by: Guillaume Martres <smarter@ubuntu.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 13 Jan 2014 00:04:47 +0000 (01:04 +0100)]
avcodec/huffman: raise the input capability of ff_huff_gen_len_table() from 8 to 14bit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 13 Jan 2014 00:03:54 +0000 (01:03 +0100)]
avcodec/huffman: extend ff_huff_gen_len_table() to allow >8bit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Sun, 5 Jan 2014 20:00:40 +0000 (21:00 +0100)]
vp9/x86: add ff_vp9_loop_filter_[vh]_16_16_ssse3().
16662 decicycles in loop_filter_h_16_16_c,
8387355 runs, 1253 skips
17510 decicycles in loop_filter_v_16_16_c,
8387516 runs, 1092 skips
4941 decicycles in ff_vp9_loop_filter_h_16_16_ssse3,
8387887 runs, 721 skips
3899 decicycles in ff_vp9_loop_filter_v_16_16_ssse3,
8387980 runs, 628 skips
Overall decode time goes from:
./ffmpeg -v 0 -nostats -threads 1 -i ~/samples/vp9/ped1080p.webm -f null - 8.10s user 0.02s system 99% cpu 8.126 total
to:
./ffmpeg -v 0 -nostats -threads 1 -i ~/samples/vp9/ped1080p.webm -f null - 6.15s user 0.04s system 99% cpu 6.199 total
(46 to 61 fps)
Clément Bœsch [Sat, 11 Jan 2014 11:58:08 +0000 (12:58 +0100)]
vp9/x86: factor out some code in VP9_UNPACK_MULSUB_2W_4X.
Clément Bœsch [Sat, 11 Jan 2014 11:41:21 +0000 (12:41 +0100)]
vp9/x86: remove reg redundancy in VP9_MULSUB_2W_2X.
Clément Bœsch [Sat, 11 Jan 2014 11:37:29 +0000 (12:37 +0100)]
vp9/x86: merge IDCT coef macros.
Michael Niedermayer [Sun, 12 Jan 2014 19:04:35 +0000 (20:04 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vc1dsp: K&R formatting cosmetics
Conflicts:
libavcodec/vc1dsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 8 Jan 2014 16:12:22 +0000 (17:12 +0100)]
swscale: disable ARM code until its build failure with clang/iphone is fixed
See: "19:40 Yu Xiaolei Re: [FFmpeg-devel] [PATCH] fix build with gas-preprocessor.pl"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Sat, 11 Jan 2014 23:59:24 +0000 (00:59 +0100)]
vc1dsp: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Michael Niedermayer [Sun, 12 Jan 2014 17:01:23 +0000 (18:01 +0100)]
Revert "swscale: disable ARM code until its build failure with clang/iphone is fixed"
This reverts commit
c8c7736c1025bcf5bb27e104a0d0eae749408739 .
Yu Xiaolei [Sun, 12 Jan 2014 16:56:26 +0000 (00:56 +0800)]
fix build with gas-preprocessor.pl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Serhii Marchuk [Sat, 11 Jan 2014 20:54:29 +0000 (22:54 +0200)]
mpegts muxer, DVB subtitles encoder: common DVB subtitles payload
Improved DVB subtitles encoder to generate AVPacket.data in the same
format as generates MPEGTS demuxer + DVB subtitles parser. So now single
format of DVB subtitles data is used across all the components of FFmpeg:
only subtitles payload WITHOUT 0x20 0x00 bytes at the beginning and 0xFF
trailing byte.
Improved MPEGTS muxer to support format of DVB subtitles in
AVPacket.data described above: while muxing we add two bytes 0x20 0x00 to
the beginning of and 0xFF to the end of DVB subtitles payload.
The patch fixes DVB subtitle copy problems: tickets #2989 fully and #2024
partly.
Signed-off-by: Clément Bœsch <u@pkh.me>
Stefano Sabatini [Fri, 10 Jan 2014 10:07:42 +0000 (11:07 +0100)]
examples/muxing: simplify video PTS setting
Rely on frame_count. Also more consistent with audio path.
Michael Niedermayer [Sun, 12 Jan 2014 03:10:04 +0000 (04:10 +0100)]
avcodec/dct-test: add support for C prores IDCT
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Guillaume Martres [Sat, 11 Jan 2014 21:46:25 +0000 (22:46 +0100)]
hevc: remove useless clip in FUNC(sao_band_filter)()
The src buffer should only contain values in the interval
[0, (1 << BIT_DEPTH) - 1]. Since shift = (BIT_DEPTH - 5), src[x] >> shift
must be in the interval [0, 31], so no clip is needed.
This removes the code that was changed in
5856bca360c5bc3e340a357d91b1f993c80a7bea
as the clip that was repositioned in that commit is removed
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Guillaume Martres [Sat, 11 Jan 2014 21:46:24 +0000 (22:46 +0100)]
hevc: clip pixels when transquant bypass is used
Fixes: asan_stack-oob_eae8e3_7333_WPP_B_ericsson_MAIN10_2.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
This is a more proper fix than
5856bca360c5bc3e340a357d91b1f993c80a7bea
The reconstructed picture should always be clipped (see section 8.6.5),
previously we did not clip coding units where
cu_transquant_bypass_flag == 1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 11 Jan 2014 23:17:49 +0000 (00:17 +0100)]
avcodec/dct-test: reproduce 4..1019 clipping when testing prores IDCT
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 11 Jan 2014 22:57:47 +0000 (23:57 +0100)]
avcodec/dct-test: correct output bias of prores idct
This way the output values make sense
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Sat, 11 Jan 2014 02:38:38 +0000 (21:38 -0500)]
vp9: fix mt-related hang a parser infinite loop.
Fixes trac ticket 3274.
Looked-at-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 11 Jan 2014 20:45:41 +0000 (21:45 +0100)]
avcodec/mjpegenc: use a seperate chroma matrix when luma and chroma differ
drop hardcoded TWOMATRIX code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 11 Jan 2014 20:38:11 +0000 (21:38 +0100)]
avcodec/mpegvideo_enc: init chroma matrix for mjpeg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 11 Jan 2014 20:26:51 +0000 (21:26 +0100)]
avcodec/mjpegenc: pass chroma quantization matrix through as well, not just luma
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 11 Jan 2014 19:40:35 +0000 (20:40 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
flv: Workaround for buggy Omnia A/XE encoder
Conflicts:
libavformat/flvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Sat, 11 Jan 2014 15:52:41 +0000 (16:52 +0100)]
hevc: Clip the pixel before shifting
Prevent an out of array bound read.
Fixes: asan_stack-oob_eae8e3_7333_WPP_B_ericsson_MAIN10_2.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 11 Jan 2014 19:23:51 +0000 (20:23 +0100)]
avcodec/hevc: use av_mallocz() for allocating tab_ipm
Fixes use of uninitialized memory and out of stack array read
Fixes: signal_sigsegv_ecc526_7846_WPP_C_ericsson_MAIN_2.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Benjamin Larsson [Sun, 5 Jan 2014 13:42:14 +0000 (14:42 +0100)]
flv: Workaround for buggy Omnia A/XE encoder
The Omnia A/XE encoder writes the explicit extra data incorrectly
and wrongly disables parametric stereo. Truncating the extra data
by setting the size to 2 works around this. The AAC extra data
parser will then only parse the correct parts.
Bug-id: 599
Michael Niedermayer [Sat, 11 Jan 2014 03:44:42 +0000 (04:44 +0100)]
avcodec/alac: warn if not all channels where decoded
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 11 Jan 2014 03:36:15 +0000 (04:36 +0100)]
avcodec/alac: only set *got_frame_ptr when all channels have been decoded
Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f8b64436530_7895_quicktime_newcodec_applelosslessaudiocodec.m4a
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 11 Jan 2014 02:07:31 +0000 (03:07 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
arm: Add an option for making sure NEON registers aren't clobbered
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Fri, 10 Jan 2014 00:51:22 +0000 (01:51 +0100)]
avformat/pjsdec: dont increase pointer when its already at the end in read_ts()
Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f91f2de7764_2649_PJS_capability_tester.pjs
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 11 Jan 2014 01:04:01 +0000 (02:04 +0100)]
avcodec/wmalosslessdec: shrink output on error so no uninitialized data is returned
Fixes use of uninitialized memory
partly fixes: msan_uninit-mem_7f7834b6a530_6473_luckynight-partial.wma
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 11 Jan 2014 00:59:20 +0000 (01:59 +0100)]
avcodec/wmalosslessdec: deallocate uninitialized frame on decode_tilehdr() failure
Fixes use of uninitialized memory
partly fixes: msan_uninit-mem_7f7834b6a530_6473_luckynight-partial.wma
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 11 Jan 2014 00:58:36 +0000 (01:58 +0100)]
avcodec/wmalosslessdec: Pass on error code from decode_tilehdr()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 10 Jan 2014 23:14:27 +0000 (00:14 +0100)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Cast signed libopenjpeg data values to unsigned before shifting.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Fri, 10 Jan 2014 23:03:37 +0000 (00:03 +0100)]
Cast signed libopenjpeg data values to unsigned before shifting.
This avoids undefined behaviour on left-shift.
Reviewed-by: Michael Bradshaw
Hendrik Leppkes [Fri, 10 Jan 2014 19:18:08 +0000 (20:18 +0100)]
vdpau: restore compatibility with deprecated fields in AVVDPAUContext
Fixes ticket #3133.
Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com>
Tested-by: EricV
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 10 Jan 2014 22:10:47 +0000 (23:10 +0100)]
avformat/matroskadec: check generic audio deinterleaver sub_packet_size against frame_size
Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f67d052a530_7517_nosound.mkv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Fri, 20 Dec 2013 11:51:50 +0000 (13:51 +0200)]
arm: Add an option for making sure NEON registers aren't clobbered
This is pretty much based on the same test for XMM registers.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Fri, 10 Jan 2014 20:06:15 +0000 (21:06 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: Explicitly specify the rgb555le pixel format for the mss2 rgb555 tests
See:
34e90b2e6d66c511bea872bcb3a0e34b482b8c17
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 10 Jan 2014 19:58:19 +0000 (20:58 +0100)]
avformat/flvdec: initialize context before reading from it
Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f9b8387069e_5377_flv_with_pcm_s16be_audio_track.flv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 10 Jan 2014 16:50:33 +0000 (17:50 +0100)]
nut: Support XYZ12 rawvideo
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 10 Jan 2014 16:23:04 +0000 (17:23 +0100)]
swscale: fix rgb48Toxyz12() endianness
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 10 Jan 2014 15:56:37 +0000 (16:56 +0100)]
avcodec/mss2: fix chroma dimensions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Fri, 10 Jan 2014 14:05:10 +0000 (16:05 +0200)]
fate: Explicitly specify the rgb555le pixel format for the mss2 rgb555 tests
This fixes these fate tests on big endian.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Thu, 9 Jan 2014 17:33:39 +0000 (18:33 +0100)]
avformat/avisynth simplify packet allocation
Reviewed-by: Stephen Hutchinson <qyot27@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Fri, 10 Jan 2014 09:57:43 +0000 (10:57 +0100)]
Fix libopenjpeg colour range adjust for 8<bpp<16.
Fixes ticket #3284.
Reviewed-by: Michael Bradshaw
Carl Eugen Hoyos [Fri, 10 Jan 2014 09:55:51 +0000 (10:55 +0100)]
Support signed j2k images via libopenjpeg.
Fixes ticket #3283.
Reviewed-by: Michael Bradshaw
Carl Eugen Hoyos [Fri, 10 Jan 2014 09:47:46 +0000 (10:47 +0100)]
Unscaled 16bit packed RGB to planar GBR converter.
Fixes r210(rgb48) -> ffv1 (gbrp10) -> r210 roundtrip
as reported by forum user JasonCA.
Michael Niedermayer [Fri, 10 Jan 2014 04:51:15 +0000 (05:51 +0100)]
fate: fix MSS2 tests on big endian
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 10 Jan 2014 02:57:46 +0000 (03:57 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avutil: do not use avcodec header in frame.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>