aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* avformat/utils/av_probe_input_buffer2: fix offset checkMichael Niedermayer2014-01-131-3/+2
| | | | | | The check could fail if avio_read() read less than requested Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/utils/av_probe_input_buffer2: Fix pd.buf_sizeMichael Niedermayer2014-01-131-1/+2
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-01-130-0/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * lavf: make av_probe_input_buffer more robustAnton Khirnov2014-01-131-2/+1
| | | | | | | | | | | | | | Always use the actually read size as the offset instead of making possibly invalid assumptions. Addresses: CVE-2012-6618
* | Merge commit '8b76362836f3c373c3aadc544522edcbef16dd5f'Michael Niedermayer2014-01-131-1/+1
|\| | | | | | | | | | | | | | | | | | | * commit '8b76362836f3c373c3aadc544522edcbef16dd5f': lavf: use a fixed width type Conflicts: libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: use a fixed width typeAnton Khirnov2014-01-131-1/+1
| | | | | | | | It's shorter and more consistent with the rest of the code.
* | Merge commit 'c1868e7ee7b07b40a0fe15f50df89fe499a01a50'Michael Niedermayer2014-01-130-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * lavf: simplify handling of offset in av_probe_input_buuffer()Anton Khirnov2014-01-131-6/+4
| |
* | Merge commit '99e20125232d40ea239a5b54d26bbfe526506114'Michael Niedermayer2014-01-135-1/+70
|\| | | | | | | | | | | | | * commit '99e20125232d40ea239a5b54d26bbfe526506114': x86/arm: Add clobber tests to libavresample Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86/arm: Add clobber tests to libavresampleMartin Storsjö2014-01-135-1/+70
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '49b9badcaab513b65b79be371b1a9c1012e482ea'Michael Niedermayer2014-01-130-0/+0
|\| | | | | | | | | | | | | | | * commit '49b9badcaab513b65b79be371b1a9c1012e482ea': vc1: Enable the interlaced B-frame codepath. See: 33f2a4942380184f3a28cbf2a36366c8ed105232 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1: Enable the interlaced B-frame codepath.Tim Walker2014-01-131-1/+0
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '6d98959c8a5a749592a878b9523b31eccea5d102'Michael Niedermayer2014-01-131-14/+16
|\| | | | | | | | | | | | | | | | | | | | | * commit '6d98959c8a5a749592a878b9523b31eccea5d102': vc1: Add avg_no_rnd_vc1_chroma_mc4_c() Conflicts: libavcodec/vc1dsp.c See: dd6e291e4083b7af53968c0ae06330841f63405b Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1: Add avg_no_rnd_vc1_chroma_mc4_c()Michael Niedermayer2014-01-131-0/+23
| | | | | | | | | | | | Needed for proper interlaced support. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'c798a6fedc3dd9ed3ac1fb2d95819af58705a87e'Michael Niedermayer2014-01-131-48/+23
|\| | | | | | | | | | | | | * commit 'c798a6fedc3dd9ed3ac1fb2d95819af58705a87e': vc1: Factorize out chroma MC Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1: Factorize out chroma MCLuca Barbato2014-01-131-48/+23
| |
* | avcodec/hevc: Check entry point arrays for malloc failureMichael Niedermayer2014-01-131-0/+5
| | | | | | | | | | | | | | 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>
* | hevc: Bound check slice_qpLuca Barbato2014-01-131-1/+11
| | | | | | | | | | | | | | | | | | | | 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>
* | hevc: Reject impossible dependent tileLuca Barbato2014-01-131-0/+5
| | | | | | | | | | | | | | | | | | | | | | 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>
* | avcodec/huffman: raise the input capability of ff_huff_gen_len_table() from ↵Michael Niedermayer2014-01-131-1/+1
| | | | | | | | | | | | 8 to 14bit Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/huffman: extend ff_huff_gen_len_table() to allow >8bitMichael Niedermayer2014-01-134-9/+22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vp9/x86: add ff_vp9_loop_filter_[vh]_16_16_ssse3().Clément Bœsch2014-01-123-0/+672
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
* | vp9/x86: factor out some code in VP9_UNPACK_MULSUB_2W_4X.Clément Bœsch2014-01-121-8/+9
| |
* | vp9/x86: remove reg redundancy in VP9_MULSUB_2W_2X.Clément Bœsch2014-01-121-9/+9
| |
* | vp9/x86: merge IDCT coef macros.Clément Bœsch2014-01-121-23/+19
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-01-121-321/+403
|\| | | | | | | | | | | | | | | | | | | * qatar/master: vc1dsp: K&R formatting cosmetics Conflicts: libavcodec/vc1dsp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1dsp: K&R formatting cosmeticsLuca Barbato2014-01-121-321/+403
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | swscale: disable ARM code until its build failure with clang/iphone is fixedMichael Niedermayer2014-01-122-5/+5
| | | | | | | | | | | | See: "19:40 Yu Xiaolei Re: [FFmpeg-devel] [PATCH] fix build with gas-preprocessor.pl" Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Revert "swscale: disable ARM code until its build failure with clang/iphone ↵Michael Niedermayer2014-01-122-5/+5
| | | | | | | | | | | | is fixed" This reverts commit c8c7736c1025bcf5bb27e104a0d0eae749408739.
* | fix build with gas-preprocessor.plYu Xiaolei2014-01-121-4/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegts muxer, DVB subtitles encoder: common DVB subtitles payloadSerhii Marchuk2014-01-124-15/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | examples/muxing: simplify video PTS settingStefano Sabatini2014-01-121-3/+1
| | | | | | | | Rely on frame_count. Also more consistent with audio path.
* | avcodec/dct-test: add support for C prores IDCTMichael Niedermayer2014-01-121-0/+10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | hevc: remove useless clip in FUNC(sao_band_filter)()Guillaume Martres2014-01-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | 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>
* | hevc: clip pixels when transquant bypass is usedGuillaume Martres2014-01-121-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | avcodec/dct-test: reproduce 4..1019 clipping when testing prores IDCTMichael Niedermayer2014-01-121-0/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/dct-test: correct output bias of prores idctMichael Niedermayer2014-01-111-0/+4
| | | | | | | | | | | | This way the output values make sense Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vp9: fix mt-related hang a parser infinite loop.Ronald S. Bultje2014-01-112-3/+7
| | | | | | | | | | | | | | Fixes trac ticket 3274. Looked-at-by: ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegenc: use a seperate chroma matrix when luma and chroma differMichael Niedermayer2014-01-111-28/+18
| | | | | | | | | | | | drop hardcoded TWOMATRIX code Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpegvideo_enc: init chroma matrix for mjpegMichael Niedermayer2014-01-111-0/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegenc: pass chroma quantization matrix through as well, not just lumaMichael Niedermayer2014-01-114-9/+12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-01-111-0/+9
|\| | | | | | | | | | | | | | | | | | | * qatar/master: flv: Workaround for buggy Omnia A/XE encoder Conflicts: libavformat/flvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flv: Workaround for buggy Omnia A/XE encoderBenjamin Larsson2014-01-111-0/+6
| | | | | | | | | | | | | | | | | | 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
* | hevc: Clip the pixel before shiftingLuca Barbato2014-01-111-1/+1
| | | | | | | | | | | | | | | | 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>
* | avcodec/hevc: use av_mallocz() for allocating tab_ipmMichael Niedermayer2014-01-111-1/+1
| | | | | | | | | | | | | | 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>
* | avcodec/alac: warn if not all channels where decodedMichael Niedermayer2014-01-111-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/alac: only set *got_frame_ptr when all channels have been decodedMichael Niedermayer2014-01-111-1/+2
| | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-01-114-0/+155
|\| | | | | | | | | | | | | | | | | | | * qatar/master: arm: Add an option for making sure NEON registers aren't clobbered Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * arm: Add an option for making sure NEON registers aren't clobberedMartin Storsjö2014-01-114-0/+155
| | | | | | | | | | | | This is pretty much based on the same test for XMM registers. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/pjsdec: dont increase pointer when its already at the end in read_ts()Clément Bœsch2014-01-111-1/+2
| | | | | | | | | | | | | | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 11:10:43 +0000