Michael Niedermayer
5d509fbdcf
Merge commit 'eeeb5c291d3f78eaade5b99c2614c7cab0e9be79'
...
* commit 'eeeb5c291d3f78eaade5b99c2614c7cab0e9be79':
vsrc_movie: do not free avoption variables in uninit()
Conflicts:
libavfilter/src_movie.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-21 10:41:41 +02:00
Anton Khirnov
eeeb5c291d
vsrc_movie: do not free avoption variables in uninit()
...
The generic code frees them as well. Since av_free was used to free them
instead of av_freep, this would result in a double free.
2013-06-20 13:27:14 +02:00
Jean Delvare
b08cd2fb94
delogo: Fix function description
...
The algorithm works on src and writes to dst, not the other way
around.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-19 22:13:12 +02:00
Michael Niedermayer
209cb8afe0
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
lavfi: switch ff_default_get_audio_buffer() to av_frame_get_buffer()
Conflicts:
libavfilter/audio.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-19 08:27:35 +02:00
Michael Niedermayer
602d0bfe67
Merge branch 'frame_num_offset' of https://github.com/mjmvisser/FFmpeg
...
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-19 01:25:50 +02:00
Mark Visser
2090abcc43
add the start_number offset to var_values[VAR_N] directly, instead of adding it in func_frame_num
2013-06-18 17:38:17 -04:00
Anton Khirnov
c9c7bc4493
lavfi: switch ff_default_get_audio_buffer() to av_frame_get_buffer()
...
This simplifies the code and avoids using libavcodec-specific
avcodec_fill_audio_frame().
2013-06-18 11:21:16 +02:00
Michael Niedermayer
e41bf19d2c
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
lavfi: math typo in interlace filter
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-18 09:31:05 +02:00
Alexander Strasser
ac604e446b
lavfi/src_movie: Use movie_common_init instead individual wrappers
...
Makes it easier to understand that there is no difference in init
callback for movie and amovie. Also saves a few lines of code.
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
2013-06-18 00:02:30 +02:00
Alexander Strasser
c679a1c358
lavfi/src_movie: Check pointer is not NULL before deref
...
Also do not check against empty string, the lower levels should
be able to deal with it.
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
2013-06-18 00:02:30 +02:00
Vittorio Giovara
cd0faeee62
lavfi: math typo in interlace filter
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-06-17 12:25:43 +02:00
Mark Visser
0defc77e9d
added start_number parameter to drawtext to permit an offset to n/frame_num var
2013-06-14 17:05:19 -04:00
Clément Bœsch
147adf2c4f
lavfi/spp: fix description.
2013-06-14 06:53:52 +02:00
Jean Delvare
cef42ded8d
drawbox: Respect thickness parameter
...
The drawbox video filter is drawing lines one pixel thinner than
requested. The default thickness is 4 pixel but in fact the lines
drawn by default are only 3 pixel wide.
Change the comparisons in the code to fix this off-by-one bug. Also
change the default thickness from 4 to 3 to minimize the unexpected
changes from the user's perspective.
As I was already touching these lines, I also removed the "maximum" in
the thickness parameter description, as I don't think it was adding
any value and I even found it confusing.
Reviewed-by: Andrey Utkin <andrey.krieger.utkin@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-14 03:52:32 +02:00
Clément Bœsch
852f74bd85
lavfi/mp: remove mp=spp.
...
The filter was ported to a native libavfilter filter.
2013-06-14 01:27:22 +02:00
Clément Bœsch
a2c547ffec
lavfi: add spp filter.
2013-06-14 01:27:22 +02:00
Stefano Sabatini
e0135a4bcd
lavfi/rotate: add angle command
2013-06-13 01:21:47 +02:00
Stefano Sabatini
dc5e26d67f
lavfi: add rotate filter
...
Based on the libavfilter SOC filter by Vitor Sessak, with the following additions:
* integer arithmetic
* bilinear interpolation
* RGB path
* configurable parametric angle, output width and height
Address trac issue #1500 .
See thread:
Subject: [FFmpeg-devel] [WIP] rotate filter(s)
Date: 2010-10-03 17:35:49 GMT
2013-06-13 01:21:47 +02:00
Michael Niedermayer
d3e89f2641
vf_sab: Fix memleak
...
Fixes CID1030353
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-10 22:00:43 +02:00
Clément Bœsch
b77e58aad3
lavfi/pp: set out frame size.
...
w/h from input frame are not copied in av_frame_copy_props(). This
commit avoids a mismatch between aligned_[wh] and outbuf->{width,height}
(and thus avoids triggering an assert in avfilter because of this).
2013-06-08 23:23:30 +02:00
Clément Bœsch
f97e28ebe5
lavfi/lut3d: add sanity checks.
...
Should fix CID1026775 and CID1026774.
2013-06-07 01:48:41 +02:00
Paul B Mahol
3554238863
lavfi/il: add timeline support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-06-06 17:44:54 +00:00
Paul B Mahol
7d01533371
lavfi/framestep: cosmetics: reindent AVFilter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-06-06 17:19:16 +00:00
Paul B Mahol
27d3d61343
lavfi/framestep: add timeline support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-06-06 17:17:14 +00:00
Michael Niedermayer
2280b539c5
Merge commit '8b7dffc2d6c6c19f8e0a1fedcd0e95dce7a273ff'
...
* commit '8b7dffc2d6c6c19f8e0a1fedcd0e95dce7a273ff':
lavfi doxy: improve/extend AVFilter doxy.
Conflicts:
libavfilter/avfilter.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-05 12:05:41 +02:00
Stefano Sabatini
449558d34a
lavfi/mp: remove mp=sab
...
The filter was ported to a native libavfilter filter.
2013-06-05 00:06:51 +02:00
Stefano Sabatini
841df7bf86
lavfi: port sab filter from libmpcodecs
2013-06-05 00:06:51 +02:00
Anton Khirnov
8b7dffc2d6
lavfi doxy: improve/extend AVFilter doxy.
2013-06-04 17:18:33 +02:00
Michael Niedermayer
43487bc5c1
avfilter/vf_mcdeint: free frame on error
...
Fixes CID1026766
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-03 15:41:29 +02:00
Michael Niedermayer
3ed56b3b39
avfilter/process_options: fix memleak
...
Fixes CID1026765
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-03 15:26:50 +02:00
Michael Niedermayer
7e7d090907
avfilter/af_astats: rename stat()
...
See CID1026741
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-03 14:59:52 +02:00
Nicolas George
50a4d076ce
lavfi/trim: mark link closed on EOF.
...
Fix trac ticket #2620 .
2013-06-02 23:19:42 +02:00
Stefano Sabatini
ec34963276
lavfi/mp: drop mcdeint wrapper
...
It was ported to a native libavfilter filter.
2013-06-01 22:35:20 +02:00
Stefano Sabatini
e89182fc94
lavfi: port mcdeint filter from libmpcodecs
2013-06-01 22:34:57 +02:00
Stefano Sabatini
3a2b9911bf
lavfi/mp/mcdeint: avoid uninited data read
...
Do not read padding or out-of-buffer values when computing the output
value for a pixel close to the image buffer edge.
This avoids non visible artifacts which affected the output checksum.
See thread:
Subject: [FFmpeg-devel] [PATCH] lavfi/mp/mcdeint: avoid uninited data read
Date: Thu, 30 May 2013 18:57:14 +0200
2013-06-01 22:34:50 +02:00
Clément Bœsch
1fb52bf920
lavfi/mptestsrc: fix chroma subsampling with odd sizes.
...
This makes no difference in practice since w & h are hardcoded to 512.
2013-06-01 12:05:55 +02:00
Clément Bœsch
7ba04b3c48
lavfi/pixdesctest: fix chroma subsampling with odd sizes.
2013-06-01 12:05:55 +02:00
Clément Bœsch
7de8a38160
lavfi/vignette: remove extra semi-colon.
2013-05-31 10:22:03 +02:00
Clément Bœsch
2886e8065e
lavfi/vignette: add aspect option.
2013-05-30 20:51:12 +02:00
Clément Bœsch
33620e243f
lavfi/vignette: add some scaling debug.
2013-05-30 20:41:56 +02:00
Clément Bœsch
bfafcc4ebe
lavfi/vignette: simplify dmax definition.
2013-05-30 20:41:37 +02:00
Clément Bœsch
cf6f179044
lavfi/vignette: fix scale with aspects smaller than one.
2013-05-30 20:40:39 +02:00
Clément Bœsch
4a85390d29
lavfi/vignette: make sure a sane sar is set.
2013-05-30 18:13:04 +02:00
Clément Bœsch
0ab9362fcb
lavfi: add vignette filter.
2013-05-30 17:52:52 +02:00
Paul B Mahol
f8f42f4821
lavfi/noise: fix out of array access
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-29 16:54:28 +00:00
Paul B Mahol
83f9735592
lavfi/noise: support slice threading
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-29 16:13:11 +00:00
Clément Bœsch
1f1df07ce5
lavfi/drawutils: attempt to fix subsampling.
2013-05-28 19:20:27 +02:00
Dave Yeo
e615a77799
os2threads: move from lavc to compat/
...
For useage in other places besides lavc. Needed after commit
90f9a5830b
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-28 12:49:20 +02:00
Clément Bœsch
160ea26560
lavfi/haldclutsrc: 10l remove size options.
2013-05-27 20:53:25 +02:00
Clément Bœsch
92a2d12a71
lavfi/overlay: remove do_blend forward declaration.
2013-05-27 20:42:46 +02:00