aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* ffmpeg: use intermediary variables in reap_filters, increase readabilityStefano Sabatini2014-01-261-12/+11
|
* doc/filters: re-edit notes on filtergraph escapingStefano Sabatini2014-01-261-29/+25
| | | | | | | State the escaping rules more explicitly, reword various sentences and drop confusing quoting example. Should fix trac issue #3334.
* avcodec/huffyuvenc: fix end pointer for stats_outMichael Niedermayer2014-01-261-2/+3
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/huffyuvenc: fail if stats_out is too small instead of silently ↵Michael Niedermayer2014-01-261-0/+2
| | | | | | truncating Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* fate: add test for 16bps ffvhuffMichael Niedermayer2014-01-263-1/+10
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/libfdk_aacenc: enable 7.1 channel encodingJean First2014-01-262-1/+15
| | | | | | | 7.1(wide) and 7.1(wide-side) channel layouts are supported in fdk_aac since october 2013 (commit fa3eba1644) Signed-off-by: Jean First <jeanfirst@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-01-261-1/+1
|\ | | | | | | | | | | | | * qatar/master: configure: clang: explicitly state dep file and rule name in DEPFLAGS Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: clang: explicitly state dep file and rule name in DEPFLAGSJanne Grunau2014-01-251-1/+1
| | | | | | | | | | | | Fixes dependency file generation with gas-preprocessor.pl and clang. Flags copied from GCC and tested with Apple's clang from Xcode 5 and 5.1 and clang 3.2, 3.3, 3.4 on Linux.
* | Merge commit 'fb87e69ff77f96536768dbae01d82db70c8b41f3'Michael Niedermayer2014-01-261-0/+1
|\| | | | | | | | | | | | | * commit 'fb87e69ff77f96536768dbae01d82db70c8b41f3': configure: add missing x86 dependency for i686 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: add missing x86 dependency for i686Janne Grunau2014-01-251-0/+1
| |
* | avcodec/mpeg12dec: Revert Change to mpeg2_fast_decode_block_non_intraMichael Niedermayer2014-01-261-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the speed regression from 20626f53e9f41cb3db82329ed3db7d773cfa3a8f and still checks sufficiently to prevent out of allocated memory accesses due to the index Before: 1823 decicycles in mpeg2_fast_decode_block_non_intra, 8388493 runs, 115 skips After: 1808 decicycles in mpeg2_fast_decode_block_non_intra, 8388494 runs, 114 skips Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpeg12dec: Redesign index checks for mpeg2_fast_decode_block_intraMichael Niedermayer2014-01-261-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the speed regression from 20626f53e9f41cb3db82329ed3db7d773cfa3a8f and still checks sufficiently to prevent out of allocated memory accesses due to the index Before: 1681 decicycles in mpeg2_fast_decode_block_intra, 4194238 runs, 66 skips After: 1658 decicycles in mpeg2_fast_decode_block_intra, 4194248 runs, 56 skips Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '6d93307f8df81808f0dcdbc064b848054a6e83b3'Michael Niedermayer2014-01-261-25/+33
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6d93307f8df81808f0dcdbc064b848054a6e83b3': mpeg12: check scantable indices in all decode_block functions Benchmarks Before: 1878 decicycles in mpeg2_decode_block_non_intra, 8388487 runs, 121 skips 1700 decicycles in mpeg2_decode_block_intra, 4194239 runs, 65 skips 1808 decicycles in mpeg2_fast_decode_block_non_intra, 8388492 runs, 116 skips 1669 decicycles in mpeg2_fast_decode_block_intra, 4194248 runs, 56 skips -- 2056 decicycles in mpeg1_decode_block_inter, 65535 runs, 1 skips 2346 decicycles in mpeg1_decode_block_intra, 32768 runs, 0 skips 2011 decicycles in mpeg1_fast_decode_block_inter, 65533 runs, 3 skips ---------------- After: 1858 decicycles in mpeg2_decode_block_non_intra, 8388490 runs, 118 skips 1691 decicycles in mpeg2_decode_block_intra, 4194233 runs, 71 skips 1823 decicycles in mpeg2_fast_decode_block_non_intra, 8388493 runs, 115 skips 1681 decicycles in mpeg2_fast_decode_block_intra, 4194238 runs, 66 skips -- 2010 decicycles in mpeg1_decode_block_inter, 65535 runs, 1 skips 2322 decicycles in mpeg1_decode_block_intra, 32766 runs, 2 skips 1995 decicycles in mpeg1_fast_decode_block_inter, 65535 runs, 1 skips All benchmarks are the best scores of several runs Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg12: check scantable indices in all decode_block functionsJanne Grunau2014-01-251-23/+31
| | | | | | | | | | | | | | | | | | Add checks to the fast functions used with CODEC_FLAGS2_FAST and move the check for all other functions to before the invalid memory is accessed. Fixes https://trac.videolan.org/vlc/ticket/9713 with CODEC_FLAGS2_FAST. CC: libav-stable@libav.org
* | avutil/internal.h: add timer.h backMichael Niedermayer2014-01-261-0/+1
| | | | | | | | | | | | | | | | | | Without this a developer would have to add a include every time he wants to benchmark some code, this is a moderate inconvenience. This reverts the specific hunk from fb0c9d41d685abb58575c5482ca33b8cd457c5ec Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'fb0c9d41d685abb58575c5482ca33b8cd457c5ec'Michael Niedermayer2014-01-2612-1/+11
|\| | | | | | | | | | | | | | | | | | | | | * commit 'fb0c9d41d685abb58575c5482ca33b8cd457c5ec': avutil: remove timer.h include from internal.h Conflicts: libavcodec/ffv1dec.c libavutil/internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avutil: remove timer.h include from internal.hJanne Grunau2014-01-2511-1/+10
| | | | | | | | Added libavutil/timer.h include to all files with {START,STOP}_TIMER.
* | avcodec/huffyuv: support AV_PIX_FMT_YUV(A)4XYP16 and GRAY16Michael Niedermayer2014-01-263-34/+117
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_scale: simplify alignment codeMichael Niedermayer2014-01-251-9/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_scale: do aspect ratio and scale factor compensation togetherMichael Niedermayer2014-01-251-6/+4
| | | | | | | | | | | | Fixes rounding error Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge branch 'scale-filter-factor' of https://github.com/lkiesow/FFmpegMichael Niedermayer2014-01-252-4/+30
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'scale-filter-factor' of https://github.com/lkiesow/FFmpeg: Documentation for scale filter factor Documentation for scale filter factor Fixed factor for scale filter Factors for scale filter Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Documentation for scale filter factorLars Kiesow2014-01-251-0/+5
| | |
| * | Documentation for scale filter factorLars Kiesow2014-01-251-0/+1
| | |
| * | Fixed factor for scale filterLars Kiesow2014-01-251-3/+5
| | |
| * | Factors for scale filterLars Kiesow2014-01-251-4/+22
| | |
* | | avcodec/libx264: also consider ticks per frame for fps/timebase setupMichael Niedermayer2014-01-251-2/+4
| | | | | | | | | | | | | | | | | | Setting fps = 1/timebase is not correct Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | x86/lossless_videodsp: silly one-line cosmetic.Clément Bœsch2014-01-251-1/+1
| | |
* | | x86/lossless_videodsp: use common macro for add and diff int16 loop.Clément Bœsch2014-01-251-46/+26
| | |
* | | x86/lossless_videodsp: simplify and explicit aligned/unaligned flagsClément Bœsch2014-01-251-55/+27
|/ /
* | lavfi/drawtext: add option for drawing border around textRamiro Polla2014-01-253-9/+56
| | | | | | | | | | Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi/drawtext: get bitmap from glyph in a separate stepRamiro Polla2014-01-252-5/+11
| | | | | | | | | | | | | | | | This change makes it possible to transform the glyph or get its border before turning it into a bitmap. Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'rbultje/vp9-simd'Michael Niedermayer2014-01-253-270/+460
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rbultje/vp9-simd: vp9: fix memory corruption if header decoding fails after size change. vp9/x86: use explicit register for relative stack references. vp9/x86: iwht4x4 (lossless) mmx. vp9/x86: 4x4 iadst SIMD (ssse3) variants. vp9/x86: 8x8 iadst SIMD (ssse3/avx) variants. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | vp9: fix memory corruption if header decoding fails after size change.Ronald S. Bultje2014-01-241-1/+2
| | |
| * | vp9/x86: use explicit register for relative stack references.Ronald S. Bultje2014-01-241-222/+218
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this patch, we explicitly modify rsp, which isn't necessarily universally acceptable, since the space under the stack pointer might be modified in things like signal handlers. Therefore, use an explicit register to hold the stack pointer relative to the bottom of the stack (i.e. rsp). This will also clear out valgrind errors about the use of uninitialized data that started occurring after the idct16x16/ssse3 optimizations were first merged.
| * | vp9/x86: iwht4x4 (lossless) mmx.Ronald S. Bultje2014-01-242-0/+46
| | |
| * | vp9/x86: 4x4 iadst SIMD (ssse3) variants.Ronald S. Bultje2014-01-242-1/+73
| | | | | | | | | | | | | | | | | | | | | | | | Cycle measurements for intra itxfm_4x4_add on ped1080p.webm: idct_idct: 66 -> 67 cycles (noise measurement) idct_iadst: 199 -> 79 cycles iadst_idct: 165 -> 70 cycles iadst_iadst: 183 -> 82 cycles
| * | vp9/x86: 8x8 iadst SIMD (ssse3/avx) variants.Ronald S. Bultje2014-01-242-46/+121
| | | | | | | | | | | | | | | | | | | | | | | | Cycle measurements for intra itxfm_8x8_add on ped1080p.webm: idct_idct: 133 -> 135 cycles (noise measurement) idct_iadst: 900 -> 241 cycles iadst_idct: 864 -> 215 cycles iadst_iadst: 973 -> 310 cycles
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-01-251-0/+113
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | * qatar/master: dxtory: compressed RGB555/RGB565 decoding support Conflicts: libavcodec/dxtory.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | dxtory: compressed RGB555/RGB565 decoding supportKostya Shishkov2014-01-241-0/+113
| | |
* | | Merge commit '0e1ad2f591b87e944550c15b54e54f8189743289'Michael Niedermayer2014-01-251-11/+418
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0e1ad2f591b87e944550c15b54e54f8189743289': dxtory: add more compressed and uncompressed modes Conflicts: libavcodec/dxtory.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | dxtory: add more compressed and uncompressed modesKostya Shishkov2014-01-241-11/+418
| | |
* | | avcodec/dvbsubdec: Remove unused display_list_sizeMichael Niedermayer2014-01-251-3/+0
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Fixed a memory leak in dvbsubenc.c: sub->num_rects was reduced without ↵Wim Vander Schelden2014-01-251-3/+7
| |/ |/| | | | | | | | | | | freeing the associated rects. Signed-off-by: Wim Vander Schelden <lists@fixnum.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/avienc: cosmetic indentJames Darnley2014-01-241-4/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/avienc: use metadata_header_paddingJames Darnley2014-01-241-1/+9
| | | | | | | | | | | | | | | | The muxer will write at least the number of bytes requested and possibly up to 3 bytes more. This is because the muxer writes 32-bit integers and the format requires 4-byte alignment anyway. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/id3v2enc: update comment about minimum paddingJames Darnley2014-01-241-4/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/id3v2enc: use metadata_header_paddingJames Darnley2014-01-244-10/+17
| | | | | | | | | | | | | | As with the change to flacenc this allows the user to control the amount of padding they want added to the file. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/flacenc: fix comment after previous changeJames Darnley2014-01-241-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/flacenc: use metadata_header_paddingJames Darnley2014-01-241-2/+10
| | | | | | | | | | | | | | | | | | Allows a user to control the amount, if any, of padding they want added to the file. If set to zero the block will not be written at all. If set to some positive number four more bytes will be added to the file due to the small header required for the block. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | AVFormatContext: add metadata_header_padding fieldJames Darnley2014-01-244-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | This field is used to store the number of bytes that should be written as padding to a metadata header of a file. For example: - The FLAC format's METADATA_BLOCK_PADDING [1] - The ID3v2 tag format's padding [2] [1] http://xiph.org/flac/format.html#metadata_block_padding [2] http://id3.org/id3v2.3.0#ID3v2_overview Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 07:45:25 +0000