summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* spherical: Change types of bounding and pad to uint32_tVittorio Giovara2017-03-17
| | | | | | | | | These values are defined to be 32bit in the specification, so it makes more sense to store them as fixed width. Based on a patch by Micahel Niedermayer <michael@niedermayer.cc>. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* fate: Do not report side data sizeVittorio Giovara2017-03-17
| | | | | | | This field is of little value, and interferes with testing side data, since sizes can be different on multiple architectures. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* Merge commit '0638b99cdba52554691fc668d9e477bc184c7a33'Matthieu Bouron2017-03-17
|\ | | | | | | | | | | | | | | | | | | * commit '0638b99cdba52554691fc668d9e477bc184c7a33': aiff: Skip padding byte for odd-sized chunks Also removes to odd-size checks from get_aiff_header and get_meta to use the generic path introduced by the original commit. Merged-by: Matthieu Bouron <matthieu.bouron@gmail.com>
| * aiff: Skip padding byte for odd-sized chunksDiego Biurrun2016-08-10
| | | | | | | | Bug-Id: 660
* | avcodec: estimate output bitrate for uncompressed video codecsTobias Rapp2017-03-17
| | | | | | | | | | | | | | | | | | | | | | Allows to get a more realistic total bitrate (and estimated file size) in avi_write_header. Previously a static default value of 200k was assumed. Adds an internal helper function for bitrate guessing. Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com> Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffmpeg: set the encoding framerate when the output is CFRAnton Khirnov2017-03-17
| | | | | | | | | | | | (cherry picked from Libav commit d10102d23c9467d4eb84f58e0cd12be284b982f6) Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
* | avcodec/nvenc: allow different const-qps for I, P and B framesKonda Raju2017-03-17
| | | | | | | | Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
* | swresample/resample: do not assert compensation_distance on rebuild_filterMuhammad Faiz2017-03-17
| | | | | | | | | | | | | | | | | | | | | | | | when set_compensation is called with zero sample_delta, compensation does not happen (because dst_incr == ideal_dst_incr) but compensation_distance is set regression since 01ebb57c03abde89bca7bdbc552917efcb8f551d Found-by: wm4 <nfxjfg@googlemail.com> Reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
* | avcodec: fix uninitialized variable readwm42017-03-17
| | | | | | | | | | | | | | This cna happen if the user tries to call the new decode API for subtitles. Fixes CID 1402071.
* | lavu/spherical: Make AVSphericalMapping pointer parameter const.Carl Eugen Hoyos2017-03-16
| | | | | | | | | | Reflects the actual code and silences a gcc warning: ffprobe.c:1797:42: warning: passing argument 1 of 'av_spherical_tile_bounds' discards 'const' qualifier from pointer target type
* | Merge commit '0df4801105d84883071b0978cb3afc7cd5184ce8'Clément Bœsch2017-03-16
|\| | | | | | | | | | | | | | | | | * commit '0df4801105d84883071b0978cb3afc7cd5184ce8': vp9: make mv bounds 32bit. This commit is a noop, see 024fac5cd4f74d237b7b285355d7e463c1911196 Merged-by: Clément Bœsch <u@pkh.me>
| * vp9: make mv bounds 32bit.Ronald S. Bultje2016-08-03
| | | | | | | | | | | | | | | | | | The frame dimensions are 16bit, so the mv bounds can easily overflow int16 for large videos. Bug-Id: Handbrake/46 CC: libav-stable@libav.org Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '24a362569bff1d4161742fffaca80a4a4428be8a'Clément Bœsch2017-03-16
|\| | | | | | | | | | | | | * commit '24a362569bff1d4161742fffaca80a4a4428be8a': buffer: fix av_buffer_realloc() when the data is offset wrt buffer start Merged-by: Clément Bœsch <u@pkh.me>
| * buffer: fix av_buffer_realloc() when the data is offset wrt buffer startAnton Khirnov2016-08-03
| | | | | | | | | | | | | | | | | | In such a case behave as if the buffer was not reallocatable -- allocate a new one and copy the data (preserving just the part described by the reference passed to av_buffer_realloc). CC: libav-stable@libav.org Reported-By: wm4 <nfxjfg@googlemail.com>
* | lavc/internal: Constify AVPacket* in AVCodecInternal.Carl Eugen Hoyos2017-03-16
| | | | | | | | | | Fixes a gcc warning: libavcodec/utils.c:2244:26: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
* | lavc/avpacket: Make pkt parameter of av_packet_get_side_data() const.Carl Eugen Hoyos2017-03-16
| | | | | | | | | | Reflects the actual code and silences a gcc warning: libavcodec/utils.c:2102:36: warning: passing argument 1 of 'av_packet_get_side_data' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
* | doc/muxers: cleanup mpegts sectionLou Logan2017-03-16
| | | | | | | | | | | | | | | | | | Add missing options. List correct variable types. Re-order options and markup flag options properly. Add more texinfo markup. Signed-off-by: Lou Logan <lou@lrcd.com>
* | configure: clang -Oz for small size build to reduce size furtherwang-bin2017-03-16
| |
* | lavf/mpegtsenc: clarify pcr_period unit of measurementLou Logan2017-03-16
| | | | | | | | | | | | pcr_period is in milliseconds. Signed-off-by: Lou Logan <lou@lrcd.com>
* | Merge commit 'e99ecda55082cb9dde8fd349361e169dc383943a'Clément Bœsch2017-03-16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e99ecda55082cb9dde8fd349361e169dc383943a': checkasm: add vp9 MC tests. vp9mc/x86: sse2 MC assembly. vp9mc/x86: add AVX and AVX2 MC vp9mc/x86: rename ff_* to ff_vp9_* vp9mc/x86: rename ff_avg[48]_sse to ff_avg[48]_mmxext vp9mc/x86: simplify a few inits. vp9mc/x86: add 16px functions (64bit only). Noop (aside from a formatting comment in vp9mc.asm). We already have all of this. We should consider making a final diff between the two projects when the dust comes down. Merged-by: Clément Bœsch <u@pkh.me>
| * checkasm: add vp9 MC tests.Ronald S. Bultje2016-08-03
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * vp9mc/x86: sse2 MC assembly.Ronald S. Bultje2016-08-03
| | | | | | | | | | | | | | Also a slight change to the ssse3 code, which prevents a theoretical overflow in the sharp filter. Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * vp9mc/x86: add AVX and AVX2 MCJames Almer2016-08-03
| | | | | | | | | | | | | | | | Roughly 25% faster MC than ssse3 for blocksizes 32 and 64. Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * vp9mc/x86: rename ff_* to ff_vp9_*Clément Bœsch2016-08-03
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * vp9mc/x86: rename ff_avg[48]_sse to ff_avg[48]_mmxextJames Almer2016-08-03
| | | | | | | | | | | | | | | | pavgb is an sse integer instruction, so the mmxext flag is enough Signed-off-by: James Almer <jamrial@gmail.com> Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * vp9mc/x86: simplify a few inits.Clément Bœsch2016-08-03
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * vp9mc/x86: add 16px functions (64bit only).Ronald S. Bultje2016-08-03
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '89466de4aeaf5e359489b81b8a9920a2bc7936d6'Clément Bœsch2017-03-16
|\| | | | | | | | | | | | | | | | | * commit '89466de4aeaf5e359489b81b8a9920a2bc7936d6': vp9/x86: rename vp9dsp to vp9mc File was already renamed, only the top description is updated. Merged-by: Clément Bœsch <u@pkh.me>
| * vp9/x86: rename vp9dsp to vp9mcAnton Khirnov2016-08-03
| | | | | | | | It only contains the MC SIMD, other SIMD will go into different files.
* | swresample/options: enable linear_interp and exact_rational by defaultMuhammad Faiz2017-03-17
| | | | | | | | | | | | better quality without speedloss Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
* | avcodec/h264_cabac: Fix runtime error: negation of -2147483648 cannot be ↵Michael Niedermayer2017-03-16
| | | | | | | | | | | | | | | | | | represented in type 'int'; cast to an unsigned type to negate this value to itself Fixes: 858/clusterfuzz-testcase-5168477042114560 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/h264idct_template: fix multiple runtime error: signed integer overflowMichael Niedermayer2017-03-16
| | | | | | | | | | | | | | | | | | Fixes: 857/clusterfuzz-testcase-5319093760557056 Benchmark changes from 335->333 (so if its not a random fluctuation then it would be faster) Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | fate: Add vf_framerate test.Alexis Ballier2017-03-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavf/vf_framerate: Fix frame leak when increasing framerate.Alexis Ballier2017-03-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavc/tests/dct/aarch64: add ff_simple_idct_neon testMatthieu Bouron2017-03-16
| |
* | lavc/aarch64: add ff_simple_idct{,_add,_put}_neon functionsMatthieu Bouron2017-03-16
| |
* | ffmpeg: don't use resample_lavr_optsRostislav Pehlivanov2017-03-16
| | | | | | | | | | | | | | That pointer isn't used by absolutely anything. Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com> Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '89aebc5bcc6e23a0a79c3f51c3a55c3571692ba0'James Almer2017-03-15
|\| | | | | | | | | | | | | * commit '89aebc5bcc6e23a0a79c3f51c3a55c3571692ba0': lavc: align the linesize to 32 when AVX is enabled Merged-by: James Almer <jamrial@gmail.com>
| * lavc: align the linesize to 32 when AVX is enabledAnton Khirnov2016-08-03
| |
* | Merge commit '63ac8e2d93080b74f6be32c7c3c1a1e44aacf34e'James Almer2017-03-15
|\| | | | | | | | | | | | | | | | | * commit '63ac8e2d93080b74f6be32c7c3c1a1e44aacf34e': lavu: add LOCAL_ALIGNED_32 This commit is a noop, see 25d5ea6d5a08820a40dd145d40ddfaecdb44837b Merged-by: James Almer <jamrial@gmail.com>
| * lavu: add LOCAL_ALIGNED_32James Almer2016-08-03
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '3c504bc3599f00bfc5923adc114beef34bce11d0'James Almer2017-03-15
|\| | | | | | | | | | | | | * commit '3c504bc3599f00bfc5923adc114beef34bce11d0': x86: deduplicate some constants Merged-by: James Almer <jamrial@gmail.com>
| * x86: deduplicate some constantsChristophe Gisquet2016-08-03
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'd3e4d406b020b0464486318aceda08bd8f69ca41'James Almer2017-03-15
|\| | | | | | | | | | | | | | | | | * commit 'd3e4d406b020b0464486318aceda08bd8f69ca41': h264dec: reset nb_slice_ctx_queued for hwaccel decoding This commit is a noop, see 744801989099df26e90b00062c645969c5347533 Merged-by: James Almer <jamrial@gmail.com>
| * h264dec: reset nb_slice_ctx_queued for hwaccel decodingAnton Khirnov2016-08-03
| | | | | | | | | | | | Fixes hwaccel decoding of files with multiple slices. Found-By: Mark Thompson <sw@jkqxz.net>
* | Merge commit 'e5b019725f53b79159931d3a7317107cbbfd0860'James Almer2017-03-15
|\| | | | | | | | | | | | | | | | | * commit 'e5b019725f53b79159931d3a7317107cbbfd0860': m4vdec: Check for non-startcode 00 00 00 sequences in probe This commit is a noop, see 7c1835c52a4be2e4e996f83c91a8d5a147b01100 Merged-by: James Almer <jamrial@gmail.com>
| * m4vdec: Check for non-startcode 00 00 00 sequences in probeMichael Niedermayer2016-08-03
| | | | | | | | | | | | | | This makes the m4v detection less trigger-happy. Bug-Id: 949 Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '3ccec334b8502701e72ef13bed25913c3578022e'James Almer2017-03-15
|\| | | | | | | | | | | | | * commit '3ccec334b8502701e72ef13bed25913c3578022e': sbrdsp: Move a misplaced #endif directive to the right spot Merged-by: James Almer <jamrial@gmail.com>
| * sbrdsp: Move a misplaced #endif directive to the right spotDiego Biurrun2016-08-03
| |
* | Merge commit 'e723dce6f8ba1e8260433b6ecfe5a3262f4c7a99'James Almer2017-03-15
|\| | | | | | | | | | | | | | | | | * commit 'e723dce6f8ba1e8260433b6ecfe5a3262f4c7a99': dvbsubdec: Use NULL instead of 0 as pointer value This commit is a noop. The affected code isn't in our tree. Merged-by: James Almer <jamrial@gmail.com>