virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
87,213 Commits 37 Branches 400 Tags 460 MiB
ef7fe81b85
Commit Graph

87213 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steven Liu
ef7fe81b85 flvdec: Check the avio_seek return value after reading a metadata packet 
merge from libav: 585dc1aece

If the metadata packet is corrupted, flv_read_metabody can accidentally
read past the start of the next packet. If the start of the next packet
had been flushed out of the IO buffer, we would be unable to seek to
the right position (on a nonseekable stream).

Prefer to clearly error out instead of silently trying to read from a
desynced stream which will only be interpreted as garbage.

Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
 2017-09-07 08:30:14 +08:00
Pavel Koshevoy
25b5096400 lavfi/atempo: Avoid false triggering an assertion failure 
Steps to reproduce:
1. revert 4240e5b047
2. ./ffmpeg -f lavfi -i sine=d=1 -af aselect=e=0,atempo=0.5 -y atempo.wav

Signed-off-by: Marton Balint <cus@passwd.hu>
 2017-09-06 23:57:59 +02:00
Pavel Koshevoy
edb4ba5bd4 Revert "lavfi/atempo: avoid false triggering an assertion failure" 
This reverts commit 4240e5b047.

Fixes ticket #6540.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2017-09-06 23:57:54 +02:00
James Almer
f4e593f7b5 avcodec/audiotoolboxdec: use av_freep() 
This prevents leaving dangling pointers.
 2017-09-06 13:04:21 -03:00
James Almer
3242babf64 avcodec/audiotoolboxdec: switch to the new generic filtering mechanism 
Tested-by: ubitux
Signed-off-by: James Almer <jamrial@gmail.com>
 2017-09-06 12:54:27 -03:00
James Almer
e49338a9c0 avcodec/audiotoolboxdec: add FF_CODEC_CAP_INIT_CLEANUP to the decoder capabilities 
Extradata may be allocated and the AudioConverterRef may be created during init(),
which in case of a failure would not be freed as close() isn't called afterwards.

Signed-off-by: James Almer <jamrial@gmail.com>
 2017-09-06 11:35:14 -03:00
James Almer
7273e234de avcodec/audiotoolboxdec: always use a copy of the AVCodecContext extradata 
Fixes memleaks introduced by 954e2b3d34

Signed-off-by: James Almer <jamrial@gmail.com>
 2017-09-06 11:35:07 -03:00
Paul B Mahol
eea69a9f25 avfilter/af_dcshift: add direct path 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-09-06 11:46:24 +02:00
Michael Niedermayer
d8bc198d09 avfilter/vf_overlay: Restore shorthand option order 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-09-05 23:55:19 +02:00
Kaustubh Raste
fa805df060 libavcodec/mips: Improve avc idct8 msa function 
Replace memset call with msa stores.

Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-09-05 22:16:03 +02:00
James Almer
9a174d203a avfilter/lavfutils: remove usage of AVStream->codec 
Signed-off-by: James Almer <jamrial@gmail.com>
 2017-09-05 14:21:41 -03:00
Karthick J
837c55e072 avformat/hlsenc: Added configuration to override HTTP User-Agent 
Signed-off-by: Karthick J <kjeyapal@akamai.com>
Signed-off-by: Steven Liu <lq@onvideo.cn>
 2017-09-05 23:30:52 +08:00
Clément Bœsch
516ac7bcc7 build: consistent spacing between lists (cosmetics) 2017-09-05 12:45:25 +02:00
Paul B Mahol
a5e6cd79ec avfilter/avf_avectorscope: fix mistake in previous commit 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-09-05 11:55:23 +02:00
Paul B Mahol
2c10f054c2 avfilter/avf_avectorscope: add possibility to auto zoom 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-09-05 11:43:49 +02:00
Paul B Mahol
6faa1275a2 avfilter: add despill filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-09-05 08:46:48 +02:00
James Almer
6cadbb16e9 avcodec: add AV_HWACCEL_CODEC_CAP_EXPERIMENTAL flag 
This flag replaces the deprecated, non-prefixed HWACCEL_CODEC_CAP_EXPERIMENTAL
one.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
 2017-09-04 17:48:41 -03:00
Paul B Mahol
b43cd67862 avfilter/vf_fftfilt: make it possible to evaluate expressions per frame 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-09-04 19:30:44 +02:00
Paul B Mahol
4705a80fb0 avfilter/vf_fftfilt: add generic timeline support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-09-04 19:04:31 +02:00
Paul B Mahol
2170ca41f4 avfilter/vf_fftfilt: add support for more pixel formats 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-09-04 18:36:37 +02:00
Paul B Mahol
2726b2d7e8 avfilter/vf_fftfilt: cache rdft contexts 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-09-04 18:24:00 +02:00
Clément Bœsch
ca7dc3ee90 lavd: drop QTKit indev 
QTKit has been deprecated in favor of AVFoundation for years, and we
have an avfoundation input device.

See https://developer.apple.com/documentation/qtkit
 2017-09-04 17:19:58 +02:00
Paul B Mahol
833a38dbe5 avfilter/vf_datascope: make it possible for output window to automatically change position 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-09-04 14:20:29 +02:00
Alex Converse
4d2b9ece45 avformat/flvdec: Set need_context_update when setting the initial extradata 
Fixes ticket 6398.

Debugged with the help of James Almer and Hendrik Leppkes.
 2017-09-03 20:01:39 -07:00
Paul B Mahol
f3c0f34f53 avfilter/vf_datascope: add timeline support to pixscope and oscilloscope 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-09-03 20:42:04 +02:00
Paul B Mahol
8b193e5530 doc/filters: add missing '' for blend example 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-09-03 20:00:53 +02:00
Paul B Mahol
05b1c60687 doc/filters: add one more blend example 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-09-03 20:00:08 +02:00
Paul B Mahol
e6e58de03d avfilter/vf_displace: add mirror edge mode 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-09-03 14:15:33 +02:00
Paul B Mahol
06ed3768c8 avfilter/vf_displace: remove useless requirement that SAR matches between input streams 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-09-03 13:37:43 +02:00
Paul B Mahol
f19e4118e9 avfilter/vf_subtitles: enable processing of alpha channel 
Fixes #6605.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-09-03 13:12:48 +02:00
Leo Izen
dda1c23c20 doc/filters.texi: Add default values to vf_vaguedenoiser options 2017-09-03 13:02:24 +02:00
Clément Bœsch
b4b1285fa1 lavd: drop disabled v4l code 
This code is disabled since 2012. V4L1 was dropped from the kernel more
than 10 years ago.
 2017-09-03 09:55:30 +02:00
Michael Niedermayer
c595139f1f avcodec/dirac_vlc: Fix invalid shift in ff_dirac_golomb_read_32bit() 
Fixes: runtime error: shift exponent 64 is too large for 64-bit type 'residual' (aka 'unsigned long')
Fixes: 2838/clusterfuzz-testcase-minimized-6260066086813696

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-09-02 23:50:28 +02:00
Michael Niedermayer
f71cd44147 avcodec/dirac_dwt: Fix multiple overflows in 9/7 lifting 
Fixes: runtime error: signed integer overflow: 1073901567 + 1073901567 cannot be represented in type 'int'
Fixes: 3124/clusterfuzz-testcase-minimized-454643435752652

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-09-02 23:50:28 +02:00
Michael Niedermayer
2a0823ae96 avcodec/diracdec: Fix integer overflow in INTRA_DC_PRED() 
Fixes: runtime error: signed integer overflow: 1168175789 + 1168178473 cannot be represented in type 'int'
Fixes: 3081/clusterfuzz-testcase-minimized-4807564879462400
Fixes: 2844/clusterfuzz-testcase-minimized-5561715838156800

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-09-02 23:50:28 +02:00
Clément Bœsch
69e6877de8 build: drop unused sndio_h and asoundlib_h 2017-09-02 16:14:15 +02:00
Clément Bœsch
e090e750ba build: make sndio part of the autodetected libraries 
sndio is already autodetected, this commit makes sure
--disable-autodetect actually disable it unless --enable-sndio is
specified.
 2017-09-02 16:14:15 +02:00
Clément Bœsch
b7fbb3516a build: make jack part of the autodetected libraries 
jack is already autodetected, this commit makes sure
--disable-autodetect actually disable it unless --enable-jack is
specified.
 2017-09-02 16:14:15 +02:00
Clément Bœsch
b447629093 build: make alsa part of the autodetected libraries 
alsa libs are already autodetected, this commit makes sure
--disable-autodetect actually disable it unless --enable-alsa is
specified.
 2017-09-02 16:14:15 +02:00
Clément Bœsch
fe9c85e4e2 build: make sure a disabled autodetect still pick the libc's iconv 2017-09-02 16:14:15 +02:00
Clément Bœsch
e3c1219c7c build: add --disable-autodetect switch 2017-09-02 16:14:15 +02:00
Clément Bœsch
9ef5a2f5f3 build: simplify weak-enabling of autodetected libraries 2017-09-02 16:14:15 +02:00
Clément Bœsch
7e98c3cbb3 build: remove vda_framework from enable_weak 
vda_framework is already pulled by the weakly enabled vda and
videotoolbox.
 2017-09-02 16:14:15 +02:00
Clément Bœsch
353c2e384c build: replace use of HAVE_SDL2 with existing CONFIG_SDL2 
There is no need for duplication.
 2017-09-02 16:14:15 +02:00
Clément Bœsch
b802971d6d build: treat sdl2 like other autodetected libraries 2017-09-02 16:14:15 +02:00
Clément Bœsch
778fa6350e build: isolate sdl-to-sdl2 aliasing 
This simplifies incoming SDL related changes by removing potential
mismatching states of sdl and sdl2 variables. Since a component can have
all kind of states (such as unset, enabled, disabled or requested),
keeping these variables in sync manually in random places is not robust.
 2017-09-02 16:14:15 +02:00
Clément Bœsch
72655616d9 build: treat securetransport and schannel like other autodetected libraries 2017-09-02 16:14:15 +02:00
Clément Bœsch
1c08ff08ad build: treat libxcb like other autodetected libraries 2017-09-02 16:14:15 +02:00
Clément Bœsch
c9075d2c65 build: treat iconv like other autodetected libraries 2017-09-02 16:14:15 +02:00
Clément Bœsch
55fdfc88b8 build: treat crystalhd like other hwaccels 2017-09-02 16:14:15 +02:00