summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* ffserver_config: cosmetic: simplify functions calls.Lukasz Marek2014-11-26
| | | | | | | | ffserver_save_avoption() and ffserver_opt_preset() have redundant arguments. They can be obtained basing on media type. This simplifies uses and reduce chance for a mistake. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* avfilter/signalstats: re-use yuv/yuvu/yuvv vars in diffClément Bœsch2014-11-26
|
* avfilter/signalstats: localize a few variablesClément Bœsch2014-11-26
|
* avfilter/signalstats: add threading in compute_sat_hue_metricsClément Bœsch2014-11-26
|
* avfilter/signalstats: isolate sat hue computation metrics in a functionClément Bœsch2014-11-26
| | | | This will be useful for the following commit
* avfilter/signalstats: add slice threading for subfiltersClément Bœsch2014-11-26
|
* avfilter/signalstats: fix repitition/repetition typoClément Bœsch2014-11-26
|
* avfilter/signalstats: reindent after previous commitClément Bœsch2014-11-26
|
* avfilter/signalstats: integrate height loop into subfiltersClément Bœsch2014-11-26
|
* avfilter/signalstats: remove pointless sub filter init systemClément Bœsch2014-11-26
|
* avfilter/signalstats: fix different buffers for out frame if burn is enabledClément Bœsch2014-11-26
| | | | This was the original intend.
* v210enc: Add SIMD optimised 8-bit and 10-bit encodersKieran Kunhya2014-11-26
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/rawdec: Check the return code of avpicture_get_size()Michael Niedermayer2014-11-26
| | | | | | | Fixes out of array access Fixes: asan_heap-oob_22388d0_3435_cov_3297128910_small_roll5_FlashCine1.cine Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/mov: Fix memleaks for duplicate STCO/CO64/STSC atomsMichael Niedermayer2014-11-26
| | | | | | | | | Also see [FFmpeg-devel] [PATCH] avformat/mov: strengthen some table allocations which contains more fixes but is unfinished Fixes: signal_sigabrt_7ffff6ac7bb9_3484_cov_1830000177_starfox2.mov Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/pngdec: Fix paeth prediction with small imagesMichael Niedermayer2014-11-26
| | | | | | | Fixes out of array read Fixes: asan_heap-oob_20b0a06_1962_cov_1907976991_delete_node_small.png Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/pngdec: Check IHDR/IDAT orderMichael Niedermayer2014-11-26
| | | | | | | Fixes out of array access Fixes: asan_heap-oob_20a6c26_2690_cov_3434532168_mail.png Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/apngdec: use packet pts and duration instead of altering stream ↵Benoit Fouet2014-11-26
| | | | | | framerate. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '234fb81e3145e9c9aec4ec16266676fab7dc21fa'Michael Niedermayer2014-11-26
|\ | | | | | | | | | | | | * commit '234fb81e3145e9c9aec4ec16266676fab7dc21fa': movenc: Expose the fragment index as an avoption Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Expose the fragment index as an avoptionMartin Storsjö2014-11-26
| | | | | | | | | | | | | | | | This allows setting the right fragment number if doing random-access writing of fragments, and also allows reading the current sequence number. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'ee37620b6ae4783cda637408422044b2d14a688c'Michael Niedermayer2014-11-26
|\| | | | | | | | | | | | | | | | | | | * commit 'ee37620b6ae4783cda637408422044b2d14a688c': movenc: Add a flag for indicating a discontinuous fragment Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Add a flag for indicating a discontinuous fragmentMartin Storsjö2014-11-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows creating a later mp4 fragment without sequentially writing the earlier ones before (when called from a segmenter). Normally when writing a fragmented mp4 file sequentially, the first timestamps of a fragment are adjusted to match the end of the previous fragment, to make sure the timestamp is the same, even if it is calculated as the sum of previous fragment durations. (And for the first packet in a file, the offset of the first packet is written using an edit list.) When writing an individual mp4 fragment discontinuously like this (with potentially writing the earlier fragments separately later), there's a risk of getting a gap in the timeline if the duration field of the last packet in the previous fragment doesn't match up with the start time of the next fragment. Using this requires setting -avoid_negative_ts make_non_negative (or -avoid_negative_ts 0). Signed-off-by: Martin Storsjö <martin@martin.st>
* | avcodec/flacdec: fix off by 1 errorMichael Niedermayer2014-11-26
| | | | | | | | | | | | | | Fixes assertion failure Fixes: signal_sigsegv_324b284_1980_dilvie___the_dragonfly.flac Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/flacdec: Call ff_flacdsp_init() unconditionallyMichael Niedermayer2014-11-26
| | | | | | | | | | | | | | Fixes out of array access Fixes: signal_sigsegv_324b135_3398_cov_246853371_short.flac Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mxfdec: dont ask for samples with field dominance 0 anymoreMichael Niedermayer2014-11-26
| | | | | | | | | | | | | | Based on discussion and patch from "[FFmpeg-devel] [PATCH]Do not ask for mxf samples with unknown field dominance" Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/apngdec: account for blend and dispose operations.Benoit Fouet2014-11-26
| | | | | | | | | | | | | | | | When the dimensions are the entire frame ones, and the dispose operation is to reset to background, or the new frame overwrites the new one, then consider the frame as a key one. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Rename sync() functions in libavformat.Carl Eugen Hoyos2014-11-25
| | | | | | | | | | Fixes compilation on Android where the sync() definition in unistd.h interferes with the static definitions in libavformat.
* | lavc/utils: free private options on avcodec_open2 failLukasz Marek2014-11-25
| | | | | | | | | | | | It protects leaking string/binary/dict options from priv context. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | lavu/opt: handle NULL obj in av_opt_nextLukasz Marek2014-11-25
| | | | | | | | | | | | It indirectly also fixes av_opt_free for NULL objs. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | lavc/libxvid: return meaningful error codesLukasz Marek2014-11-25
| | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | lavc/avuienc: fix mem leak in case of init failureLukasz Marek2014-11-25
| | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | Merge commit 'f20141d73f08ed0c8e875bd993a7143e19b266e3'Michael Niedermayer2014-11-25
|\| | | | | | | | | | | | | | | * commit 'f20141d73f08ed0c8e875bd993a7143e19b266e3': vorbis_parser: Include stdint.h in the header, to make it work standalone See: e2e36a739d3ad0d207a31c76f414a912d08b1d6d Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vorbis_parser: Include stdint.h in the header, to make it work standaloneMartin Storsjö2014-11-25
| | | | | | | | | | | | This fixes "make checkheaders". Signed-off-by: Martin Storsjö <martin@martin.st>
* | doc: add entry for APNG demuxer where needed.Benoit Fouet2014-11-25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/avio: clarify the buffer parameter of avio_alloc_contextYu Xiaolei2014-11-25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/huffyuvdec: apply vertical filter in steps of 1 line for interlaced BGRAMichael Niedermayer2014-11-25
| | | | | | | | | | | | | | Fixes out of array read Fixes: signal_sigsegv_3287332_2301_cov_2994954934_huffyuv.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/os_support: try to fix build when included from a c++ file like ↵Michael Niedermayer2014-11-25
| | | | | | | | | | | | | | libavdevice/decklink*cpp Found-by: Zeranoe Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/jacosubdec: Cleanup when avpriv_bprint_to_extradata() failsMichael Niedermayer2014-11-25
| | | | | | | | | | | | | | Fixes memleaks Fixes: asan_heap-oob_4d2250_814_cov_2745172097_JACOsub_capability_tester.jss Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/utils: Check that the data is complete in avpriv_bprint_to_extradata()Michael Niedermayer2014-11-25
| | | | | | | | | | | | | | Fixes out of array read Fixes: asan_heap-oob_4d2250_814_cov_2745172097_JACOsub_capability_tester.jss Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: Fix context fields becoming inconsistentMichael Niedermayer2014-11-25
| | | | | | | | | | | | | | Fixes out of array access Fixes: asan_heap-oob_1ca4f85_2760_cov_144449187_miss_congeniality_pegasus_ljpg.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/x86/vf_interlace: remove redundant instructionsMichael Niedermayer2014-11-25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'ca5c3ff90972a5c97aabda2ace57ba72dcd7d83b'Michael Niedermayer2014-11-25
|\| | | | | | | | | | | | | | | | | | | | | * commit 'ca5c3ff90972a5c97aabda2ace57ba72dcd7d83b': vf_interlace: x86: improve asm performance Conflicts: libavfilter/x86/vf_interlace.asm See: 05e4b25e9b0a3586033dc21548b03c8e5071efe3 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_interlace: x86: improve asm performanceMichael Niedermayer2014-11-25
| | | | | | | | 4775 decicycles -> 3688 decicycles
* | Merge commit '57ed5a64feec4af1f16f9a74c63cfa9aa8147242'Michael Niedermayer2014-11-25
|\| | | | | | | | | | | | | | | * commit '57ed5a64feec4af1f16f9a74c63cfa9aa8147242': hnm4: change width/height to int to fix hypothetical integer overflows See: e23b18321fb5cffb6e05d0b0ef00de9733f560da Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hnm4: change width/height to int to fix hypothetical integer overflowsMichael Niedermayer2014-11-25
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 1135770 / CID 1135771
* | Merge commit '16158da9607f2f84232d3dd381406b2f2449ec74'Michael Niedermayer2014-11-25
|\| | | | | | | | | | | | | | | * commit '16158da9607f2f84232d3dd381406b2f2449ec74': hnm4: Use av_image_check_size See: e23b18321fb5cffb6e05d0b0ef00de9733f560da Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hnm4: Use av_image_check_sizeLuca Barbato2014-11-25
| | | | | | | | | | | | | | As done for all the other codecs not calling it indirectly. CC: libav-stable@libav.org Bug-Id: CID 1135770 / CID 1135771
* | Merge commit '51946d2de8bd4a4aada43b6ab41340b0f5eb4ecb'Michael Niedermayer2014-11-25
|\| | | | | | | | | | | | | | | * commit '51946d2de8bd4a4aada43b6ab41340b0f5eb4ecb': vc1: Use the correct shift amount See: a52f443714b5c2a40ed272d8445f4c39220a4b69 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1: Use the correct shift amountMichael Niedermayer2014-11-25
| | | | | | | | | | | | | | | | | | `is_intra` is a 6bits bitfield. CC: libav-stable@libav.org Bug-Id: CID 1194380 / CID 1194381 Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'd25afb579facc83fd3a839f21411124d0b09f0ba'Michael Niedermayer2014-11-25
|\| | | | | | | | | | | | | | | | | | | | | * commit 'd25afb579facc83fd3a839f21411124d0b09f0ba': vc1: Set the is_intra bitfield to all 1 when needed Conflicts: libavcodec/vc1_block.c See: 04152a31cb41a7ca3cc0bde9d962454fc30bab9c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1: Set the is_intra bitfield to all 1 when neededLuca Barbato2014-11-25
| | | | | | | | | | | | | | Keep the code as similar as possible across the codepaths to ease spotting it for factorization. Based on a patch from Michael Niedermayer <michaelni@gmx.at>.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-28 16:50:46 +0000