Stowage/ffmpeg
2
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-02-07 10:19:54 +00:00
Code Issues Projects Releases Packages Wiki Activity
85221 commits 38 branches 415 tags 285 MiB
Commit graph

6327 commits

Author SHA1 Message Date
Marton Balint
508e410d34 lavfi/avfiltergraph: only return EOF in avfilter_graph_request_oldest if all sinks EOFed 
Fixes a regression introduced in 32c59a115d,
becoming effective in 912969a33e.

Fixes trimmed output of
ffmpeg -f lavfi -i "sine=d=0.01" -f lavfi -i "sine=d=1" -filter_complex "[0:a]anull[a1];[1:a]anull[a2]" -map "[a1]" -f null none -map "[a2]" -f framecrc -

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>
(cherry picked from commit c0443c1af1)
 2017-05-07 19:53:46 +02:00
Marton Balint
ecdf52745f avfilter/vf_framerate: always request input if no output is provided in request_frame 
Fixes ticket #6285.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2017-04-12 21:08:45 +02:00
Michael Niedermayer
e1cc7f83df Bump minor for 3.3 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-04-02 19:49:45 +02:00
Mark Thompson
75afad774b vf_deinterlace_vaapi: Mark as hwframe-aware 
Commits ade370a4 and e3fb74f7 were reordered while merging, so this
change got lost.
 2017-04-01 15:32:17 +01:00
Michael Niedermayer
58b867a7cf Bump minor versions for master after release/3.3 branchpoint 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-03-31 13:21:06 +02:00
Michael Niedermayer
fc332f3e29 Bump minor versions for staring release/3.3 branch 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-03-31 13:21:06 +02:00
Michael Niedermayer
55d53cb593 avfilter/avfiltergraph: Check for allocation failure in avfilter_graph_queue_command() 
Fixes: CID1396538

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-03-31 12:28:58 +02:00
Michael Niedermayer
5036e214b0 avfilter/vf_zoompan: Free out frame on error 
Fixes: CID1398578

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-03-31 12:28:58 +02:00
Michael Niedermayer
477ba8f939 avfilter/af_chorus & aecho: Handle NULL return from av_strtok() 
Fixes CID1396260

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-03-30 23:35:18 +02:00
Michael Niedermayer
855305fac2 avfilter/vf_minterpolate: Use dx and dy 
Fixes CID1396283 and CID1396284

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-03-30 22:46:31 +02:00
Michael Niedermayer
4798237f01 avfilter/deshake_opencl: Remove redundant return 
Fixes: CID1396846

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-03-30 22:46:31 +02:00
Michael Niedermayer
4064f3f0df avfilter/af_sofalizer: Fix bad shift 
Fixes CID1396835

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-03-30 22:46:31 +02:00
Gyan Doshi
2104e3383f avfilter/avf_abitscope: Correct range for framerate 
Signed-off-by: Gyan Doshi <gyandoshi@gmail.com>
Signed-off-by: Paul B Mahol <onemda@gmail.com> (via IRC)
 2017-03-30 10:29:14 -08:00
Clément Bœsch
6234fd2fa0 Merge commit '124e26971e' 
* commit '124e26971e':
  lavfi: Hardware map filter

Merged-by: Clément Bœsch <cboesch@gopro.com>
 2017-03-30 10:51:32 +02:00
Michael Niedermayer
5f019909c0 avfilter: Add AV_OPT_FLAG_FILTERING_PARAM where it is missing 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-03-30 03:12:05 +02:00
Matthieu Bouron
b5e1ec5660 Merge commit 'e3fb74f7f9' 
* commit 'e3fb74f7f9':
  lavfi: Always propagate hw_frames_ctx through links

Merged-by: Matthieu Bouron <matthieu.bouron@gmail.com>
 2017-03-30 00:02:08 +02:00
Matthieu Bouron
78e871ebbc Merge commit '7e2561fa83' 
* commit '7e2561fa83':
  lavfi: Use ff_get_video_buffer in all filters using hwframes
  vf_hwupload_cuda: Fix build error

Merged-by: Matthieu Bouron <matthieu.bouron@gmail.com>
 2017-03-29 23:33:20 +02:00
Matthieu Bouron
b265e5ba50 Merge commit '7433feb82f' 
* commit '7433feb82f':
  lavfi: Make default get_video_buffer work with hardware frames

Merged-by: Matthieu Bouron <matthieu.bouron@gmail.com>
 2017-03-29 23:12:00 +02:00
Clément Bœsch
247d0339ca lavfi/signature: fix -Wformat warnings raised by DJGPP 
This was forgotten due to the non-gpl build used in 549045254.
 2017-03-29 16:09:30 +02:00
Clément Bœsch
549045254c Fix all -Wformat warnings raised by DJGPP 2017-03-29 14:49:29 +02:00
Clément Bœsch
4606807031 lavfi/xbr: undef PI if defined 
This conflict with the DJGPP libc math.h which includes a PI macro (to
M_PI).

We cannot make DJGPP POSIX only (using -D_POSIX_SOURCE) to avoid this
kind of symbols conflicts due to the lack of both posix_memalign and
memalign (DJGPP non standard function) in that POSIX mode. We currently
rely on memalign for aligned heap allocation.
 2017-03-29 14:49:29 +02:00
Clément Bœsch
4ea8f57548 lavfi/psnr: rename pow2 to pow_2 
This conflict with the DJGPP libc which includes a pow2 function¹

We cannot make DJGPP POSIX only (using -D_POSIX_SOURCE) to avoid this
kind of symbols conflicts due to the lack of both posix_memalign and
memalign (DJGPP non standard function) in that POSIX mode. We currently
rely on memalign for aligned heap allocation.

[1]: http://www.delorie.com/djgpp/doc/libc-2.02/libc_536.html
 2017-03-29 14:49:29 +02:00
Clément Bœsch
8f9edf89d5 lavfi/dynaudnorm: rename pow2 to pow_2 
This conflict with the DJGPP libc which includes a pow2 function¹

We cannot make DJGPP POSIX only (using -D_POSIX_SOURCE) to avoid this
kind of symbols conflicts due to the lack of both posix_memalign and
memalign (DJGPP non standard function) in that POSIX mode. We currently
rely on memalign for aligned heap allocation.

[1]: http://www.delorie.com/djgpp/doc/libc-2.02/libc_536.html
 2017-03-29 14:49:29 +02:00
Clément Bœsch
ca6f0f85bb Merge commit '85baef4ff1' 
* commit '85baef4ff1':
  vf_drawtext: Move static keyword to beginning of variable declaration

This commit is mostly a noop, see:
d9e2aceb7f
6d7aa437e1

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-29 14:26:57 +02:00
Clément Bœsch
473f0f75a1 lavfi: fix race when func rets holder is NULL 
If ret is NULL, a dummy common holder is created to hold *all* the
parallel function returns, which gets written concurrently. This commit
simplify the whole logic by simply not writing to that holder when not
set.
 2017-03-28 23:47:24 +02:00
Rostislav Pehlivanov
a8fe8d6b4a lavfi: remove af_asynts filter 
Long overdue for removal, af_aresample should be used instead.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
 2017-03-27 14:06:16 +01:00
Michael Niedermayer
eaf6f10f1b avfilter/vf_signature: Replace uncommon spelling of seperate 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-03-26 20:34:47 +02:00
James Almer
963cd953fb avfilter: stop using deprecated codec flags 
Signed-off-by: James Almer <jamrial@gmail.com>
 2017-03-25 21:37:06 -03:00
Kieran Kunhya
4cca2f74f2 vf_drawtext: Fix memory leak 2017-03-21 12:15:50 +00:00
Gerion Entrup
5e3a418b60 add signature filter for MPEG7 video signature 
This filter does not implement all features of MPEG7. Missing features:
- compression of signature files
- work only on (cropped) parts of the video

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-03-21 00:11:08 +01:00
Clément Bœsch
bc1023eb36 Merge commit 'bdf7610eb2' 
* commit 'bdf7610eb2':
  vf_scale_vaapi: Crop input surface to active region

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-20 16:44:53 +01:00
Rostislav Pehlivanov
3796fb2692 lavfi: deprecate AVFilterGraph->resample_lavr_opts 
Not used by anything at all since we don't auto insert lavr filters.

Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
 2017-03-18 07:37:35 +00:00
Alexis Ballier
bbc8f3d20e lavf/vf_framerate: Fix frame leak when increasing framerate. 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-03-16 16:16:05 +01:00
Paul B Mahol
62c8dc4642 avfilter/vf_lut3d: actually skip lines when encountering DOMAIN_ string 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-03-13 15:30:05 +01:00
Jun Zhao
bf238a6a3c vf_hwupload: Add missing return value check 
Add missing return value checks to suppress build warning and
remove noop ff_formats_unref() calling.

Note: most filters using ff_formats_ref() didn't have a suitable
error handling, it's a potential memory leak issue.

Signed-off-by: Jun Zhao <jun.zhao@intel.com>
Signed-off-by: Mark Thompson <sw@jkqxz.net>
 2017-03-12 18:12:30 +00:00
Mark Thompson
b9acc7fbd9 Merge commit 'ad71d3276f' 
* commit 'ad71d3276f':
  lavfi: add a QSV deinterlacing filter

Minor fixup for lavfi differences.

Merged-by: Mark Thompson <sw@jkqxz.net>
 2017-03-12 17:00:42 +00:00
Anton Khirnov
807a3b30d2 lavfi: add a QSV scaling filter 
This merges libav commit ac7bfd6967,
which was previously skipped.

(cherry picked from commit ac7bfd6967)
Signed-off-by: Mark Thompson <sw@jkqxz.net>
 2017-03-12 15:02:33 +00:00
Muhammad Faiz
0bab78f7e7 avfilter/af_firequalizer: add av_restrict on convolution func 
slightly improved speed

Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
 2017-03-12 03:21:55 +07:00
Moritz Barsnick
114bbb0b74 libavfilter/avf_showwaves: make sqrt and cbrt scale option values available to showwavespic by name 
The 'sqrt' and 'cbrt' scalers were added in commit
80262d8c86, but their symbolic option values
only made available to the showwaves filter, not showwavespic, despite
the scalers working properly by their numerical option values.

Signed-off-by: Moritz Barsnick <barsnick@gmx.net>
 2017-03-11 11:55:57 +01:00
Muhammad Faiz
af7010ad05 avfilter/allfilters: make avfilter_register_all thread safe 
use ff_thread_once

Suggested-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
 2017-03-07 20:34:44 +07:00
Paul B Mahol
dbc7f02a72 avfilter/aeval: trim last frame's number of samples to match requested duration 
Fixes #6181.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-02-25 19:53:14 +01:00
Mark Thompson
359586f14f lavfi: Add VAAPI deinterlacer 
(cherry picked from commit ade370a4d7)
(cherry picked from commit 2d518aec4c)
 2017-02-23 22:08:26 +00:00
Rostislav Pehlivanov
42959044ac lavfi/buffersrc: fix directly setting channel layout 
When setting the channel layout directly using AVBufferSrcParameters
the channel layout was correctly set however the init function still
expected the old string format to set the number of channels (when it
hadn't already been specified).

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
 2017-02-21 16:25:47 +00:00
Pavel Koshevoy
947fdad92d avfilter/af_atempo: fix drift calculation, ticket #6157 
ticket #6157

Reported-by: Steven Liu <lq@chinaffmpeg.org>
Signed-off-by: Pavel Koshevoy <pkoshevoy@gmail.com>
 2017-02-20 10:51:28 +08:00
Marton Balint
a9f3e4b138 avfilter/f_setcmd: fix null pointer dereference on using dash as interval 
Fixes Coverity CID 1396259.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2017-02-19 16:43:53 +01:00
Paul B Mahol
aa234698e9 avfilter/vf_lut: make it possible to clip pixel values that are out of valid range 
Previous behavior was not useful at all as such pixels where all mapped to 0.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-02-13 22:54:21 +01:00
Paul B Mahol
72864547f9 avfilter/vf_lut: do not always explicitly clip pixels 
Old behaviour was not useful at all. New behaviour only emulate
old behaviour with default options.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-02-13 22:54:20 +01:00
Carl Eugen Hoyos
350ce0b9d3 lavfi/minterpolate: Remove an unused variable. 2017-02-11 16:38:56 +01:00
Maksym Veremeyenko
8efb7f5a26 avfilter/vf_scale: Fix chroma positioning for 4:2:0 pixel format 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-02-07 21:32:26 +01:00
Michael Niedermayer
4fcdc9f359 avfilter/vf_midequalizer: Remove duplicate include 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-02-06 10:45:01 +01:00