summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* avcodec/aac_defines: Fix: runtime error: left shift of negative value -2Michael Niedermayer2017-05-21
| | | | | | | Fixes: 1716/clusterfuzz-testcase-minimized-4691012196761600 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/takdec: Fix runtime error: left shift of negative value -63Michael Niedermayer2017-05-21
| | | | | | | Fixes: 1713/clusterfuzz-testcase-minimized-5791887476654080 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/mlpdsp: Fix runtime error: signed integer overflow: -24419392 * 128 ↵Michael Niedermayer2017-05-21
| | | | | | | | | cannot be represented in type 'int' Fixes: 1711/clusterfuzz-testcase-minimized-5248503515185152 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/sbrdsp_fixed: fix runtime error: left shift of 1 by 31 places cannot ↵Michael Niedermayer2017-05-21
| | | | | | | | | be represented in type 'int' Fixes: part of 1709/clusterfuzz-testcase-minimized-4513580554649600 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/aacsbr_fixed: Fix multiple runtime error: shift exponent 170 is too ↵Michael Niedermayer2017-05-21
| | | | | | | | | large for 32-bit type 'int' Fixes part of 1709/clusterfuzz-testcase-minimized-4513580554649600 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* configure: fix --tempprefix optionJames Almer2017-05-20
| | | | It was broken in 091c9860559e4d33179747c5d651bc9e31bd76eb
* avfilter: take_samples: do not directly return frame when samples are skippedMuhammad Faiz2017-05-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Modifying data pointer when skipping samples may make it unaligned. Workaround for Ticket6349. This should fix the crash of ticket's testcase and a crash/regression with avxsynth (reported by Michael Niedermayer). Also change frame->nb_samples < max to frame->nb_samples <= max. This improves performance. Benchmark: ./ffmpeg -filter_complex "aevalsrc=0:n=1166,firequalizer=fixed=on" -f null null old: 25767 decicycles in take_samples, 1023 runs, 1 skips 25422 decicycles in take_samples, 2047 runs, 1 skips 25181 decicycles in take_samples, 4095 runs, 1 skips 24904 decicycles in take_samples, 8191 runs, 1 skips new: 550 decicycles in take_samples, 1024 runs, 0 skips 548 decicycles in take_samples, 2048 runs, 0 skips 545 decicycles in take_samples, 4096 runs, 0 skips 544 decicycles in take_samples, 8192 runs, 0 skips Reviewed-by: Nicolas George <george@nsup.org> Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
* avcodec/decode: fix function nameJames Almer2017-05-20
|
* decode: fix the code reducing cropping to preserve alignmentAnton Khirnov2017-05-20
| | | | | | | Currently it does not work at all. Libav Bug-Id: 1058 (cherry picked from commit 8652a2c24836ce5546b398f12b7fed45000050e1)
* avcodec/g723_1dec: Clip after shift in estimate_sid_gain()Michael Niedermayer2017-05-20
| | | | | | | | | Fixes: runtime error: left shift of 706 by 22 places cannot be represented in type 'int' See: L_shl() in the reference software Fixes: 1609/clusterfuzz-testcase-minimized-5102163007111168 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Merge commit 'e519dcd937c7c98815ba9884867590e302272016'Clément Bœsch2017-05-20
|\ | | | | | | | | | | | | * commit 'e519dcd937c7c98815ba9884867590e302272016': dashenc: separate segments based on current segment duration Merged-by: Clément Bœsch <u@pkh.me>
| * dashenc: separate segments based on current segment durationPeter Große2017-01-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current implementation creates new segments comparing pkt->pts - first_pts > nb_segs * min_seg_duration This works fine, but if the keyframe interval is smaller than "min_seg_duration" segments shorter than the minimum segment duration are created. Example: keyint=50, min_seg_duration=3000000 segment 1 contains keyframe 1 (duration=2s < total_duration=3s) and keyframe 2 (duration=4s >= total_duration=3s) segment 2 contains keyframe 3 (duration=6s >= total_duration=6s) segment 3 contains keyframe 4 (duration=8s < total_duration=9s) and keyframe 5 (duration=10s >= total_duration=9s) ... Segment 2 is only 2s long, shorter than min_seg_duration = 3s. To fix this, new segments are created based on the actual written duration. Otherwise the option name "min_seg_duration" is misleading. Signed-off-by: Peter Große <pegro@friiks.de> Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '1920382aa9f21d7ed1a3c2214990da8d2b067a92'Clément Bœsch2017-05-20
|\| | | | | | | | | | | | | | | | | | | * commit '1920382aa9f21d7ed1a3c2214990da8d2b067a92': dashenc: add option to provide UTC timing source Also use E instead of AV_OPT_FLAG_ENCODING_PARAM to be consistent with the other AVOption. Merged-by: Clément Bœsch <u@pkh.me>
| * dashenc: add option to provide UTC timing sourcePeter Große2017-01-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If set, adds a UTCTiming tag in the manifest. This is part of the recommendations listed in the "Guidelines for Implementations: DASH-IF Interoperability Points" [1][2] Section 4.7 describes means for the Availability Time Synchronization. A usable default is "https://time.akamai.com/?iso" [1] http://dashif.org/guidelines/ [2] http://dashif.org/wp-content/uploads/2016/12/DASH-IF-IOP-v4.0-clean.pdf (current version as of writing) Signed-off-by: Peter Große <pegro@friiks.de> Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'ba6a49e60bdd61b6d02c2b26daa01942c35f39cc'Clément Bœsch2017-05-20
|\| | | | | | | | | | | | | * commit 'ba6a49e60bdd61b6d02c2b26daa01942c35f39cc': configure: Clean up temporary files on interrupt Merged-by: Clément Bœsch <u@pkh.me>
| * configure: Clean up temporary files on interruptDiego Biurrun2017-01-29
| |
* | Merge commit '78489822074096e3ae0f3c3b70accace955086f6'Clément Bœsch2017-05-20
|\| | | | | | | | | | | | | * commit '78489822074096e3ae0f3c3b70accace955086f6': configure: Place all temporary files in one separate directory Merged-by: Clément Bœsch <u@pkh.me>
| * configure: Place all temporary files in one separate directoryMichał Górny2017-01-29
| | | | | | | | | | | | | | | | | | | | Place all temporary files within a single, quasi-atomically created temporary directory rather than relying on unsafe 'mktemp -u'. This prevents possible race conditions in case two parallel 'mktemp -u' calls returned the same path. Additionally, it reduces TMPDIR pollution by keeping all test files in a single subdirectory. Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '11e225db31dcad57e2219ad8dfae2ac027af53d6'Clément Bœsch2017-05-20
|\| | | | | | | | | | | | | | | | | * commit '11e225db31dcad57e2219ad8dfae2ac027af53d6': rtmp: Account for bytes_read wraparound This commit is a noop, see 0849a0ebb2c94856c3a94cb114a1412e44904c28 Merged-by: Clément Bœsch <u@pkh.me>
| * rtmp: Account for bytes_read wraparoundLuca Barbato2017-01-29
| | | | | | | | | | | | | | Servers seem to be happy to receive the wrapped-around value as long as they receive a report, otherwise they timeout. Initially reported and analyzed by Thomas Bernhard.
* | Merge commit 'ca6ae3b77a7e6600e517723b90e57527a47809de'Clément Bœsch2017-05-20
|\| | | | | | | | | | | | | | | | | * commit 'ca6ae3b77a7e6600e517723b90e57527a47809de': vaapi_encode: Add MPEG-2 support This commit is a noop, see 3b95c7c17de0c5048eb1d38454e1c88e85517067 Merged-by: Clément Bœsch <u@pkh.me>
| * vaapi_encode: Add MPEG-2 supportMark Thompson2017-01-29
| |
* | Merge commit '3c2717e48dd8c5115f2be35c2afcabd8a1f67aee'Clément Bœsch2017-05-20
|\| | | | | | | | | | | | | * commit '3c2717e48dd8c5115f2be35c2afcabd8a1f67aee': dashenc: increase buffer time hint in the manifest Merged-by: Clément Bœsch <u@pkh.me>
| * dashenc: increase buffer time hint in the manifestAnton Schubert2017-01-27
| | | | | | | | | | | | | | to avoid rebuffering on the clientside for difficult network conditions. Signed-off-by: Anton Schubert <ischluff@mailbox.org> Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '95f1004bdfdf2d26c330c1d4b7c4ac9352d60b18'Clément Bœsch2017-05-20
|\| | | | | | | | | | | | | * commit '95f1004bdfdf2d26c330c1d4b7c4ac9352d60b18': dashenc: add mandatory id to AdaptationSet and Period in manifest Merged-by: Clément Bœsch <u@pkh.me>
| * dashenc: add mandatory id to AdaptationSet and Period in manifestPeter Große2017-01-27
| | | | | | | | | | Signed-off-by: Peter Große <pegro@friiks.de> Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '1ae6cb7d6e4fee30754a46bc91f40ff75ac4412a'Clément Bœsch2017-05-20
|\| | | | | | | | | | | | | * commit '1ae6cb7d6e4fee30754a46bc91f40ff75ac4412a': dashenc: fix ISO8601 UTC parsing Merged-by: Clément Bœsch <u@pkh.me>
| * dashenc: fix ISO8601 UTC parsingAnton Schubert2017-01-27
| | | | | | | | | | | | | | | | | | Appends Z to timestamp to force ISO8601 datetime parsing as UTC. Without Z, some browsers (Chrome) interpret the timestamp as localtime and others (Firefox) interpret it as UTC. Signed-off-by: Anton Schubert <ischluff@mailbox.org> Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '2bbb5abd877104fa9bc342c521bb49bc1aad50ce'Clément Bœsch2017-05-20
|\| | | | | | | | | | | | | * commit '2bbb5abd877104fa9bc342c521bb49bc1aad50ce': build: Map -Wall compiler flag to -W3 for MSVC and -Wextra to -W4 Merged-by: Clément Bœsch <u@pkh.me>
| * build: Map -Wall compiler flag to -W3 for MSVC and -Wextra to -W4Diego Biurrun2017-01-26
| | | | | | | | These are more appropriate warning level equivalents.
* | Merge commit '6151e9128ce2a84a443c82b78f5b5cb364ba2ab4'Clément Bœsch2017-05-20
|\| | | | | | | | | | | | | * commit '6151e9128ce2a84a443c82b78f5b5cb364ba2ab4': build: Detect blocks C language extension and add it as VDA dependency Merged-by: Clément Bœsch <u@pkh.me>
| * build: Detect blocks C language extension and add it as VDA dependencyDiego Biurrun2017-01-26
| | | | | | | | | | | | Newer versions of OS X use the blocks extension in VDA-related headers. Some compilers, like current gcc, do not support the blocks extension and fail to compile code using those headers.
* | lavf/mov: make invalid m{d,v}hd time_scale default to 1 instead of erroring outMatthieu Bouron2017-05-20
| | | | | | | | | | | | | | Some samples have their metadata track time_scale incorrectly set to 0 and the check introduced by a398f054fdb9b0f0b5a91c231fba6ce014143f71 prevents playback of those samples. Setting the time_scale to 1 fixes playback.
* | avfilter/af_sidechaincompress: change default makeup gain to 1Paul B Mahol2017-05-20
| | | | | | | | | | | | This avoids producing out of range or clipped samples. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/mlpdec: Do not leave a invalid num_primitive_matrices in the contextMichael Niedermayer2017-05-20
| | | | | | | | | | | | | | | | Fixes: runtime error: index 8 out of bounds for type 'uint8_t [8]' Fixes: 1699/clusterfuzz-testcase-minimized-6327177438035968 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/id3v2: Use ffio_ensure_seekback() in id3v2_read_internal()Michael Niedermayer2017-05-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/aviobuf: Only downscale the buffer once it has been usedMichael Niedermayer2017-05-19
| | | | | | | | | | | | The code mistook the first iteration sometimes as the end Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avfilter/graphparser: allow specifying filter@id as filter instanceMuhammad Faiz2017-05-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://lists.ffmpeg.org/pipermail/ffmpeg-user/2017-April/035975.html Parsed_filter_X could remain and user can override it with custom one. Example: ffplay -f lavfi "nullsrc=s=640x360, sendcmd='1 drawtext@top reinit text=Hello; 2 drawtext@bottom reinit text=World', drawtext@top=x=16:y=16:fontsize=20:fontcolor=Red:text='', drawtext@bottom=x=16:y=340:fontsize=16:fontcolor=Blue:text=''" Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
* | avcodec/aacsbr_fixed: Fix multiple runtime error: shift exponent 150 is too ↵Michael Niedermayer2017-05-19
| | | | | | | | | | | | | | | | | | large for 32-bit type 'int' Fixes: 1681/clusterfuzz-testcase-minimized-5970545365483520 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/aacsbr_fixed: Fix multiple runtime error: left shift of negative ↵Michael Niedermayer2017-05-19
| | | | | | | | | | | | | | | | | | | | value -407 Fixes: 1674/clusterfuzz-testcase-minimized-6092531563495424 Fixes: 1686/clusterfuzz-testcase-minimized-6282691643179008 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit 'f96d07f4ec4193fb5293d7ac8f1324aac3c3ea07'Clément Bœsch2017-05-19
|\| | | | | | | | | | | | | * commit 'f96d07f4ec4193fb5293d7ac8f1324aac3c3ea07': configure: Add quotes around a variable which might be empty Merged-by: Clément Bœsch <u@pkh.me>
| * configure: Add quotes around a variable which might be emptyMartin Storsjö2017-01-26
| | | | | | | | | | | | | | | | | | | | | | If we only have a target compiler but no host compiler, the $type variable will be empty once. (Currently we fail to do a cross build if no host compiler is available due to using the host compiler for processing option lists though. But despite that, this comparison in configure needs quotes.) Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '562ef82d6a7f96f6b9da1219a5aaf7d9d7056f1b'Clément Bœsch2017-05-19
|\| | | | | | | | | | | | | | | | | * commit '562ef82d6a7f96f6b9da1219a5aaf7d9d7056f1b': fifo: Return the correct AVERROR value This commit is a noop, see 2e81bb5e92351cc88d88a1c55d21b13532131524 Merged-by: Clément Bœsch <u@pkh.me>
| * fifo: Return the correct AVERROR valueLuca Barbato2017-01-26
| |
* | Merge commit '9bf262f4c6e14f43f291cdb745ed372884ee2a7f'Clément Bœsch2017-05-19
|\| | | | | | | | | | | | | * commit '9bf262f4c6e14f43f291cdb745ed372884ee2a7f': configure: Use proper compiler-specific speed flags for hostcc Merged-by: Clément Bœsch <u@pkh.me>
| * configure: Use proper compiler-specific speed flags for hostccDiego Biurrun2017-01-25
| |
* | Merge commit 'bf38959a30ecba4e4ee95d4f2a80ba7ece4f34be'Clément Bœsch2017-05-19
|\| | | | | | | | | | | | | * commit 'bf38959a30ecba4e4ee95d4f2a80ba7ece4f34be': configure: Move optflags checks to a more sensible place Merged-by: Clément Bœsch <u@pkh.me>
| * configure: Move optflags checks to a more sensible placeDiego Biurrun2017-01-25
| |
* | Merge commit '381a4e31a6b801a046e38b0e2b08fb61499157a7'Clément Bœsch2017-05-19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '381a4e31a6b801a046e38b0e2b08fb61499157a7': tak: Convert to the new bitstream reader magicyuv: Convert to the new bitstream reader truemotion2rt: Convert to the new bitstream reader wavpack: Convert to the new bitstream reader mpc: Convert to the new bitstream reader This merge is a noop, see http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html Merged-by: Clément Bœsch <u@pkh.me>
| * tak: Convert to the new bitstream readerAlexandra Hájková2017-01-25
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-21 00:23:18 +0000