Clément Bœsch
2a14b23484
lavfi: rename vf_ass.c to vf_subtitles.c
2013-02-17 12:58:20 +01:00
Clément Bœsch
08d149d688
lavfi/subtitles: support charenc option.
2013-02-17 12:58:20 +01:00
Clément Bœsch
3a0a959dcb
lavfi/subtitles: split options between ass and subtitles.
2013-02-17 12:58:20 +01:00
Stefano Sabatini
7ca2f8b113
lavfi/mp: drop mp=kerndeint filter
...
The filter has been natively integrated into libavfilter.
2013-02-17 11:48:45 +01:00
Stefano Sabatini
8c85a9f046
lavfi/mp: drop mp=unsharp filter
...
The native filter is equivalent from the point of view of the features
and of performances.
2013-02-17 11:48:37 +01:00
Stefano Sabatini
89505f2c3f
lavfi/unsharp: add missing NULL check
2013-02-17 11:48:31 +01:00
Stefano Sabatini
64e592eef2
lavfi/unsharp: merge definition and declaration in init_filter_param()
2013-02-17 11:48:24 +01:00
Stefano Sabatini
d2cadea3f0
lavfi/unsharp: directly access in-loop variables in apply_unsharp()
...
Increase performance, to match mp=unsharp.
2013-02-17 11:48:12 +01:00
Stefano Sabatini
ef4c71e8f8
lavfi/unsharp: add check on matrix x/y size values oddity
2013-02-17 11:47:39 +01:00
Michael Niedermayer
b4bb996d6f
yadif: remove unused variable
...
Found by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-16 13:24:43 +01:00
Paul B Mahol
af882e1819
lavfi: port MP noise filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-02-16 11:42:41 +00:00
Michael Niedermayer
446f7c62a2
Merge commit '64ed397635ef2666b0ca0c8d8c60a8bc44581d82'
...
* commit '64ed397635ef2666b0ca0c8d8c60a8bc44581d82':
vf_yadif: fix out-of line reads
Conflicts:
libavfilter/vf_yadif.c
tests/ref/fate/filter-yadif-mode0
tests/ref/fate/filter-yadif-mode1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-16 09:09:38 +01:00
Michael Niedermayer
fab8a89abe
Merge commit 'ccd70d9c1689990e5aef2de383199bbc7cf60d13'
...
* commit 'ccd70d9c1689990e5aef2de383199bbc7cf60d13':
vf_yadif: factorize initializing the filtering callbacks
Conflicts:
libavfilter/vf_yadif.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-16 08:48:45 +01:00
James Darnley
87d359ff8f
lavfi/yadif: support 9, 12, and 14 bits per pixel
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-16 00:32:02 +01:00
James Darnley
724061888b
lavfi/yadif: remove unnecessary cast
...
Finish what 99162f8
started
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-16 00:32:02 +01:00
Stefano Sabatini
f84ef19f3f
lavfi/kerndeint: move is_rgb_packed definition to the internal context
...
No need to recompute it for each new frame.
2013-02-16 00:08:31 +01:00
Clément Bœsch
51ba843f19
lavfi/kerndeint: use aligned linesizes for the temporary buffer.
...
This improves the performances just enough to match mp=kerndeint.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-02-16 00:08:31 +01:00
Stefano Sabatini
2042cd3769
lavfi/unsharp: extend range for amount values, to reflect the behavior of mp=unsharp
...
Also update the documentation accordingly, and suggest a meaningful range.
2013-02-16 00:08:31 +01:00
Stefano Sabatini
fbcc584d3a
lavfi/unsharp: use named options, and add missing checks on matrix size values
...
In particular, avoid out-of-buffer access and crashes with too big
values, and rework documentation accordingly.
2013-02-16 00:08:31 +01:00
Hendrik Leppkes
5ad43af9a6
lavfi/kerndeint: use av_pix_fmt_desc_get instead of directly accessing the table
...
Fixes FATE in MSVC DLL builds.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-15 19:07:37 +01:00
sedacca@comcast.net
b64de24fd7
lavfi/ebur128: advance pointer to samples
...
Correct the advancement of a pointer to skip over LFE samples as
intended in the loudness computation.
This suggested patch is 3 of 3 for Ticket #2144 "libavfilter ebur128
loudness inaccuracy, irregular time interval, LFE interference".
This suggested patch supersedes the contribution of January 15, 2013
in the thread “[PATCH] lavfi: EBU R.128 irreg time, ch weights, skip
LFE” which combined multiple fixes in one batch.
2013-02-15 16:39:25 +01:00
David A. Sedacca
de21e6736e
lavfi/ebur128: fix channel weights
...
Correct the recognition of channel layouts for good channel weight
in the loudness computation.
This suggested patch is 2 of 3 for Ticket #2144 "libavfilter ebur128
loudness inaccuracy, irregular time interval, LFE interference".
Signed-off-by: David A. Sedacca <sedacca at comcast.net>
2013-02-15 16:38:58 +01:00
Anton Khirnov
64ed397635
vf_yadif: fix out-of line reads
...
Some changes in the border pixels, visually indistinguishable.
2013-02-15 16:08:33 +01:00
Anton Khirnov
ccd70d9c16
vf_yadif: factorize initializing the filtering callbacks
...
Do it all in config_props().
2013-02-15 16:08:00 +01:00
Stefano Sabatini
7ac3ccc5f2
lavfi/unsharp: use the same macros used in the original MP filter
...
Remove possibly pointless inconsistency with the ported code.
Also specify parameter value ranges consistent with those of the ported
filter.
2013-02-15 01:06:56 +01:00
Clément Bœsch
0224375180
lavfi/showspectrum: simplify intensity_color_table declaration.
2013-02-14 23:10:01 +01:00
Clément Bœsch
cf8dec7d64
lavfi/showspectrum: pretty-align constants.
...
Binary object unchanged.
2013-02-14 23:04:20 +01:00
Nicolas George
c557a5b08e
lavfi/vf_ass: reindent after last commit.
2013-02-14 16:36:03 +01:00
Nicolas George
bb3303b94c
lavfi/vf_ass: ignore subtitles decoding errors.
...
A broken packet with invalid data in the middle of the stream
should not prevent from decoding the rest of the file.
Work around trac ticket #2264 .
2013-02-14 16:33:53 +01:00
Paul B Mahol
41ae43cade
lavfi: remove softskip libmpcodecs wrapper
...
It is supposed to be used with mencoder only and does
nothing when used with ffmpeg.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-02-14 12:51:56 +00:00
Paul B Mahol
968f8acec8
lavfi: remove dsize libmpcodecs wrapper
...
Filter does nothing, and supposed funcionality
is already available with native filter(s).
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-02-14 12:51:56 +00:00
Paul B Mahol
34126cd090
lavfi/transpose: support more pix fmts
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-02-13 16:29:47 +00:00
Paul B Mahol
8160864b00
lavfi/amerge: make description consistent with documentation
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-02-11 14:43:23 +00:00
Stefano Sabatini
3acaea26e5
lavfi/il: filter out hwaccels formats from the list of supported formats
2013-02-10 21:00:56 +01:00
Stefano Sabatini
0b18965434
lavfi/il: move query_formats() definition up
...
Respect order of call during the filter lifecycle, improve readability.
2013-02-10 14:00:19 +01:00
Stefano Sabatini
63a9962287
lavfi/il: simplify/generalize linesize computation
...
Rely on generic utilities for computing each plane linesize.
In particular, add support to NV12/21 formats and avoid use of
PIX_FMT_PLANAR pixdesc flag, whose semantics is questionable.
It also fixes various crashes.
2013-02-10 14:00:19 +01:00
Paul B Mahol
969039eb6e
lavfi/il: fix typo in Copyright
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-02-09 21:56:04 +00:00
Paul B Mahol
c0a8918f2a
lavfi: remove mp=il filter
...
Native il video filter is now available.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-02-09 21:43:39 +00:00
Paul B Mahol
6e9abce5e2
lavfi: port MP il filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-02-09 21:41:53 +00:00
Paul B Mahol
4fa9defc7f
lavfi/histogram: make waveform mode more useful
...
Now it displays all color components (not just luma)
either in parade or overlay and also works with RGB colorspace.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-02-09 16:05:28 +00:00
Paul B Mahol
e5670cb8a1
lavfi/histogram: make it C90 compliant
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-02-09 12:27:49 +00:00
Paul B Mahol
29a92c0114
histogram filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-02-09 11:45:56 +00:00
Stefano Sabatini
c0a4871c16
lavfi/select: correctly set prev_t and prev_pts
...
In particular, fix trac ticket #2248 .
2013-02-07 21:28:46 +01:00
Stefano Sabatini
872855e2a5
lavfi/select: avoid double -> int lossy conversion in debug log
2013-02-07 21:00:54 +01:00
Michael Niedermayer
a00c4b4db0
af_biquad: avoid subtraction in loop
...
17% faster
Note the speedup is smaller if its done before
storing in the context (gcc 4.6.3 core i7)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-07 19:46:02 +01:00
Michael Niedermayer
9f956611e3
af_biquad: unroll loop, remove variable copies
...
This makes the code about 7% faster
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-07 19:03:22 +01:00
Nicolas George
b5884db437
lavfi: fix missing space in error message.
2013-02-07 12:22:09 +01:00
Nicolas George
3dea8b375e
lavfi: remove disabled code.
2013-02-07 12:22:09 +01:00
Michael Niedermayer
6e9f3f3b65
Merge commit '238614de679a71970c20d7c3fee08a322967ec40'
...
* commit '238614de679a71970c20d7c3fee08a322967ec40':
cdgraphics: do not rely on get_buffer() initializing the frame.
svq1: replace struct svq1_frame_size with an array.
vf_yadif: silence a warning.
Conflicts:
libavcodec/svq1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-06 14:53:49 +01:00
Anton Khirnov
99162f8d46
vf_yadif: silence a warning.
...
clang says:
libavfilter/vf_yadif.c:192:28: warning: incompatible pointer types assigning to
'void (*)(uint8_t *, uint8_t *, uint8_t *, uint8_t *, int, int, int, int, int)'
from 'void (uint16_t *, uint16_t *, uint16_t *, uint16_t *, int, int, int, int, int)'
2013-02-06 10:21:51 +01:00
Michael Niedermayer
2b20397e1f
libmpcodecs/vd_ffmpeg.h: remove, its unused and removed upstream
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 15:54:39 +01:00
multiple authors
81e357db62
libmpcodecs/vf_pullup: update to latest version from mplayer
...
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 15:41:19 +01:00
multiple authors
13afcdd00e
libmpcodecs/vf_uspp: update to latest version from mplayer
...
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 15:41:00 +01:00
multiple authors
3ce3d4cc3c
libmpcodecs/vf_unsharp: update to latest version from mplayer
...
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 15:40:43 +01:00
multiple authors
7a4885600f
libmpcodecs/vf_spp: update to latest version from mplayer
...
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 14:53:53 +01:00
multiple authors
14132599a3
libmpcodecs/vf_sab: update to latest version from mplayer
...
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 14:47:33 +01:00
multiple authors
fe8bc6ddfc
libmpcodecs/pullup: update to latest version from mplayer
...
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 14:47:13 +01:00
multiple authors
8f7e3e678b
libmpcodecs/vf_noise: update to latest version from mplayer
...
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 14:18:15 +01:00
multiple authors
3ca46d0c10
libmpcodecs/vf_pp7:update to latest version from mplayer
...
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 14:17:28 +01:00
multiple authors
fdd574ed3f
libmpcodecs/vf_qp: update to latest version from mplayer
...
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 14:17:17 +01:00
multiple authors
b7e6622971
libmpcodecs/vf_mcdeint: update to latest version from mplayer
...
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 14:00:20 +01:00
multiple authors
25ed6e99d7
libmpcodecs/vf_ilpack: update to latest version from mplayer
...
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 13:59:47 +01:00
multiple authors
011702f5a9
libmpcodecs/vf_ivtc: update to latest version from mplayer
...
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 13:59:34 +01:00
multiple authors
0b36a05c17
libmpcodecs/vf_fspp: update to latest version from mplayer
...
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 13:44:53 +01:00
multiple authors
2b9eb6167b
libmpcodecs/av_helpers: update to latest version from mplayer
...
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 13:43:35 +01:00
multiple authors
e02c713fb1
libmpcodecs/vf_filmdint: update to latest version from mplayer
...
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 13:40:08 +01:00
multiple authors
5d0115118d
libmpcodecs/vf_divtc: update to latest version in mplayer
...
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 13:39:46 +01:00
multiple authors
99a0813a7e
libhmpcodec/mp_msg: update to latest from mplayer
...
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 13:02:28 +01:00
multiple authors
745cb39d05
libmpcodecs/help_mp: update to latest from mplayer
...
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 12:58:20 +01:00
multiple authors
a54737f7ea
libmpcodecs/cpudetect: update to latest from mplayer
...
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 12:55:10 +01:00
Michael Niedermayer
0b6f34cc9f
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
avfilter: x86: consistent filenames for filter optimizations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 11:56:48 +01:00
multiple authors
103a2c2b17
libmpcodecs: update img_format.* & mp_image.* to latest from mplayer
...
Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 03:30:17 +01:00
multiple authors
708ed15d8c
libmpcodecs/vf_stereo3d: update to latest version from mplayer
...
Merged commits:
commit 9a2978f37bcdf7a28235c9322e9e5a4fe15e2ff2
Author: cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu Jan 31 12:12:36 2013 +0000
Add more vf_stereo3d output formats.
Adds high quality green-magenta and yellow-blue dubois
anaglyph 3D output support.
Patch by thomas schorpp, thomas.schorpp gmail
git-svn-id: svn://svn.mplayerhq.hu:/mplayer/trunk@35906 b3059339-0415-0410-9bf9-f77b7e298cf2
commit 2c50e66460d8d3ec460cbf9425f252f75ea1022d
Author: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun Aug 12 17:31:47 2012 +0000
Add another anaglyph color variant.
Patch by Bob [mpbob ezpi net].
git-svn-id: svn://svn.mplayerhq.hu:/mplayer/trunk@35080 b3059339-0415-0410-9bf9-f77b7e298cf2
commit 71c5261c2ac63e6e29a5a899b52d1ec4bdb62c4e
Author: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun Aug 12 17:25:30 2012 +0000
Convert comments into designated initializers.
That is a simple way to ensure they always correspond
to what the compiler actually does.
git-svn-id: svn://svn.mplayerhq.hu:/mplayer/trunk@35079 b3059339-0415-0410-9bf9-f77b7e298cf2
commit d7164c5e1ba524c2a6983d979ef57e193b2c8a9f
Author: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun Aug 12 17:20:24 2012 +0000
Make compiler give the ana_coeff array automatically the right size.
Makes adding more colour schemes easier.
git-svn-id: svn://svn.mplayerhq.hu:/mplayer/trunk@35078 b3059339-0415-0410-9bf9-f77b7e298cf2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-05 03:05:54 +01:00
Diego Biurrun
e66240f22e
avfilter: x86: consistent filenames for filter optimizations
2013-02-04 15:00:47 +01:00
Rudolf Polzer
81f2549ec9
lavfi/showspectrum: display multiple channels in separate row
...
The showspectrum filter gets multiple channel (any count) support.
Signed-off-by: Rudolf Polzer <divverent@xonotic.org>
2013-02-04 13:37:43 +00:00
Rudolf Polzer
773fc6e0c7
lavfi/showspectrum: set default height to 512
...
Only power-of-two FFTs are supported; so to get a full spectrum
(that is, one up to Nyquist), the height must be a power of two.
Therefore, change the default height from 480 to 512.
Signed-off-by: Rudolf Polzer <divverent@xonotic.org>
2013-02-03 17:05:31 +00:00
Stefano Sabatini
1897109c00
lavfi/pad: add support to named options
2013-02-03 17:01:56 +01:00
Stefano Sabatini
fd6b6efbd2
lavfi/crop: fix help message for the keep_aspect option
2013-02-02 15:32:34 +01:00
Michael Niedermayer
6726fb6533
avfilter/vf_hqdn3d.h: restore author attribution, history and project name
...
See git blame of pre split avfilter/vf_hqdn3d.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-02 13:18:10 +01:00
Michael Niedermayer
d593f2b241
avfilter/x86/vf_hqdn3d_init: fix author attribution & project name
...
Reference: 7a1944b907
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-02 13:18:09 +01:00
Michael Niedermayer
0d13a7b786
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
vf_hqdn3d: x86: Add proper arch optimization initialization
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-02 13:18:01 +01:00
Diego Biurrun
76d90125cd
vf_hqdn3d: x86: Add proper arch optimization initialization
2013-02-01 13:11:45 +01:00
Nicolas George
d2ccab5f8a
lavfi/buffersrc: forward filter_frame errors.
...
Note: The ret variable was unused.
2013-01-31 21:03:54 +01:00
Nicolas George
dcce43340f
lavfi/af_amerge: set outbuf->audio->channels.
...
The value is lost because of avfilter_copy_buffer_ref_props().
Fix trac ticket #2217 .
2013-01-31 21:03:54 +01:00
Nicolas George
ae14887ee7
lavfi/af_amerge: check for buffer queue overflows.
...
Without that test, ff_bufqueue_add silently discards the
oldest buffer, that leaves in[i].nb_samples inconsistent,
and causes later a segfault.
2013-01-31 21:03:54 +01:00
Nicolas George
6560625f0a
lavfi/bufferqueue: add ff_bufqueue_is_full().
2013-01-31 21:03:54 +01:00
Stefano Sabatini
e47114d545
lavfi: increment max number of registered filters from 128 to 256
...
The total number of implemented filters is already over 128.
2013-01-31 16:47:37 +01:00
Paul B Mahol
402ea625ab
lavfi/biquads: remove pointless casts
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-01-31 13:16:32 +00:00
Paul B Mahol
b70ea49ca3
Port biquads filters from SoX
...
Adds allpass, bass, bandpass, bandreject, biquad,
equalizer, highpass, lowpass and treble filter.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-01-31 12:13:55 +00:00
Michael Niedermayer
5068bcda95
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
vf_delogo: fix copying the input frame.
Conflicts:
libavfilter/vf_delogo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-29 14:58:49 +01:00
Anton Khirnov
7194330bcd
vf_delogo: fix copying the input frame.
...
CC:libav-stable@libav.org
2013-01-29 07:33:02 +01:00
Anton Khirnov
f81c37e40f
vf_delogo: fix an uninitialized read.
...
CC:libav-stable@libav.org
2013-01-29 07:32:54 +01:00
Michael Niedermayer
1336382c6d
avfilter_get_audio_buffer_ref_from_frame: fix handling of >8 channels
...
Found-by: inferno@chromium.org
Reported-by: Dale Curtis <dalecurtis@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-28 21:45:16 +01:00
Nicolas George
42c6f2a645
lavfi/vf_drawtext: default to expansion=normal.
2013-01-26 12:52:19 +01:00
Nicolas George
255ae9f380
lavfi: version bump and change log entries after the last commits.
2013-01-26 11:25:21 +01:00
Nicolas George
699b286a21
lavfi/af_anull: accept unknown channel layouts.
2013-01-26 11:15:38 +01:00
Nicolas George
b00502457a
lavfi/af_aresample: accept unknown channel layouts.
2013-01-26 11:15:38 +01:00
Nicolas George
6d962aec8d
lavfi/af_aformat: accept unknown channel layouts.
2013-01-26 11:15:38 +01:00
Nicolas George
ea645e90a1
lavfi/buffersrc: accept unknown channel layouts.
2013-01-26 11:15:38 +01:00
Nicolas George
19506af788
lavfi/sink_buffer: accept unknown channel layouts.
...
Add a field to the AVBufferSinkParams for a list of accepted
channel counts.
Change the default value for the lists in AVBufferSinkParams
to NULL, to let lavfi fill them with something useful.
The fail_enomem path is unneeded because filters are uninited
on failure.
2013-01-26 11:15:38 +01:00
Nicolas George
b6b2f3433c
lavfi: implement ff_query_formats_all().
2013-01-26 11:15:38 +01:00
Nicolas George
7bb98b753b
lavfi: implement ff_all_channel_counts().
2013-01-26 11:15:38 +01:00
Nicolas George
b6afb2dde1
lavfi: support unknown channel layouts.
2013-01-26 11:15:38 +01:00
Stefano Sabatini
e80be5a0aa
lavfi/showwaves: fail in case of push_frame() error
2013-01-25 19:35:21 +01:00
Stefano Sabatini
b7d34b328b
lavfi/showwaves: add display mode option and mode=line
2013-01-25 17:42:04 +01:00
Michael Niedermayer
fc2922836b
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
avfilter: allow setpts filter to use wallclock time for calculations
Conflicts:
doc/filters.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-25 15:04:41 +01:00
Vladimir Pantelic
0b55b16abc
avfilter: allow setpts filter to use wallclock time for calculations
...
Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-01-25 10:50:09 +01:00
Paul B Mahol
e65046bf83
lavfi/earwax: remove config_input()
...
This is wrong function to check for input parameters.
Function is not needed because query_formats() already
sets supported sample rates.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-01-24 10:37:44 +00:00
Michael Niedermayer
ac8987591f
Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'
...
* commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f':
Drop DCTELEM typedef
Conflicts:
libavcodec/alpha/dsputil_alpha.h
libavcodec/alpha/motion_est_alpha.c
libavcodec/arm/dsputil_init_armv6.c
libavcodec/bfin/dsputil_bfin.h
libavcodec/bfin/pixels_bfin.S
libavcodec/cavs.c
libavcodec/cavsdec.c
libavcodec/dct-test.c
libavcodec/dnxhdenc.c
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/dsputil_template.c
libavcodec/eamad.c
libavcodec/h264_cavlc.c
libavcodec/h264idct_template.c
libavcodec/mpeg12.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/ppc/dsputil_altivec.c
libavcodec/proresdsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-23 17:44:56 +01:00
Paul B Mahol
a793a587df
lavfi/swapuv: support all planar yuv pixel formats
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-01-23 16:13:23 +00:00
Stefano Sabatini
5b10c5e7e4
lavfi/showwaves: fix check on showwaves->outpicref
...
outpicref is not always in synch with showwaves->outpicref, which is
changed as a side effect of the call to functions.
Fix regression introduced in 5f634480d1
,
+10l to me.
2013-01-22 20:34:29 +01:00
Michael Niedermayer
e4eebc2da9
avf_showwaves: fix null pointer dereference
...
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-21 23:00:20 +01:00
Paul B Mahol
6ea8a830e8
afade filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-01-21 15:20:42 +00:00
Xi Wang
eb553096e5
lavfi: fix null checking in avfilter_config_links()
...
Move the first use of `link' after the null pointer check.
Signed-off-by: Xi Wang <xi.wang@gmail.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-21 00:07:00 +01:00
sedacca@comcast.net
24c47f00fe
lavfi: EBU R.128 irregular time
...
Correct the time interval between logged data rows to the expected
value of 100 milliseconds by naming a new loop counter variable
to be distinct from loop counters for inner loops that
inadvertently change the outer loop operation.
This suggested patch is 1 of 3 for Ticket #2144 "libavfilter ebur128
loudness inaccuracy, irregular time interval, LFE interference".
This suggested patch supersedes the contribution of January 15, 2013
in the thread “[PATCH] lavfi: EBU R.128 irreg time, ch weights, skip
LFE” which combined multiple fixes in one patch.
Reviewed-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-19 03:13:24 +01:00
Paul B Mahol
c79be51dfc
vf_fade: use AVPixFmtDescriptor to find out if pixel format have alpha
...
Remove alpha_pix_fmts[].
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-01-18 22:51:05 +00:00
Stefano Sabatini
2852bd704a
lavfi/fade: accept shorthand syntax
2013-01-18 23:17:47 +01:00
Paul B Mahol
d084c5c742
vf_fade: support YUVA422P & YUVA444P
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-01-18 14:35:30 +00:00
Michael Niedermayer
68f92a70f1
Merge commit 'dae1d507af94261bafd3b11549884e5d1eca590e'
...
* commit 'dae1d507af94261bafd3b11549884e5d1eca590e':
x86: Add PAVGB macro to abstract pavgb/pavgusb instruction via cpuflags
vf_fps: add final flushed frames to the dropped frame count
rv34_parser: Adjust #if for disabling individual parsers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-16 11:44:45 +01:00
Justin Ruggles
23098bbd50
vf_fps: add final flushed frames to the dropped frame count
2013-01-15 11:26:46 -05:00
Michael Niedermayer
329675cfd7
Merge commit 'a1c525f7eb0783d31ba7a653865b6cbd3dc880de'
...
* commit 'a1c525f7eb0783d31ba7a653865b6cbd3dc880de':
pcx: return meaningful error codes.
tmv: return meaningful error codes.
msrle: return meaningful error codes.
cscd: return meaningful error codes.
yadif: x86: fix build for compilers without aligned stack
lavc: introduce the convenience function init_get_bits8
lavc: check for overflow in init_get_bits
Conflicts:
libavcodec/cscd.c
libavcodec/pcx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-14 14:43:32 +01:00
Daniel Kang
67360ccd51
yadif: x86: fix build for compilers without aligned stack
...
Manually load registers to avoid using 8 registers on x86_32 with
compilers that do not align the stack (e.g. MSVC).
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-01-14 09:51:52 +01:00
Michael Niedermayer
6f88d2d786
vsrc_testsrc: Fix assignments in if()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-14 05:05:40 +01:00
Paul B Mahol
5b9126ba84
lavfi/gradfun: support YUV440P
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-01-13 13:23:30 +00:00
Matthieu Bouron
f9eed5d7e6
lavfi/aevalsrc: try to honor specified duration
...
If nb_samples divide sample_rate and if nb_samples allow it, aevalsrc
should generate the exact amount of samples according to duration.
Example:
aevalsrc=0::n=480:s=48000:d=5.21 should generate 250080 samples.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-01-12 17:26:35 +01:00
Nicolas George
7e5c5fa5fc
lavfi/vf_overlay: check that filter_frame does not return EAGAIN.
...
EAGAIN is used internally in the code; it currently does not make
sense as a return code from the next filter.
Should fix CID966655.
2013-01-10 21:55:02 +01:00
Michael Niedermayer
65b8527993
Merge commit 'f7bf72a4a1146a7583577c9bdc066767e1ba3c6a'
...
* commit 'f7bf72a4a1146a7583577c9bdc066767e1ba3c6a':
idcinvideo: correctly set AVFrame defaults
yadif: Port inline assembly to yasm
au: remove unnecessary casts
au: return AVERROR codes instead of -1
Conflicts:
libavcodec/idcinvideo.c
libavfilter/x86/yadif_template.c
libavformat/au.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-10 12:27:16 +01:00
André Pankratz
0287eea914
lavfi/yadif: fix shorthand/option mismatch
...
Fix trac ticket #2128 .
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-01-10 11:01:14 +01:00
Daniel Kang
899157b308
yadif: Port inline assembly to yasm
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-01-09 18:41:02 +01:00
Nicolas George
ff6b34009d
lavfi: fix use-after-free in ff_filter_frame.
...
Unlike the original ff_start_frame code, the incoming reference
may be freed before that point.
Fix CID966654.
2013-01-08 13:31:33 +01:00
Clément Bœsch
caee85bbce
lavfi/kerndeint: remove unused pixel_step.
2013-01-06 18:59:15 +01:00
Clément Bœsch
f6659e5c5e
lavfi/kerndeint: fix temp buffer linesize.
...
Also re-enable the FATE test.
2013-01-06 18:59:15 +01:00
Michael Niedermayer
e797f22efa
vf_tinterlace: fix logical/bit op mixup
...
Fixes CID966642
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-06 04:38:53 +01:00
Clément Bœsch
521daf1409
lavfi/kerndeint: get pix format description only once.
...
This makes the code faster.
2013-01-06 04:37:33 +01:00
Clément Bœsch
aaf59766b9
lavfi/avfilter: remove now unused {src,cur,out}_buf.
...
This was supposed to be removed in 565e4993
, but it was delayed due to
the port of the remaining filters. These buffer ref pointers are not
used anymore, thus dropped.
2013-01-06 04:14:56 +01:00
Michael Niedermayer
0ef615126f
vf_kerndeint: memset buffer to avoid use of uninitialized memory.
...
This might fix fate failures.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-06 02:40:44 +01:00
Michael Niedermayer
39d1875455
libavfilter/video.h: remove unused things related to the start/slice/end API
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-05 23:36:09 +01:00
Michael Niedermayer
2468827c06
internal.h: remove start/end_frame from AVFilterPad
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-05 23:36:09 +01:00
Carl Eugen Hoyos
6a9af92565
Allow remaining 32bit RGB packed pix_fmts in kerndeint filter.
...
Reviewed-by: Stefano Sabatini
2013-01-05 14:40:06 +01:00
Stefano Sabatini
860b5c0a63
lavfi/kerndeint: fix mismatch between declared pixel format and test
...
+10l.
2013-01-05 14:04:33 +01:00
Matthieu Bouron
be0a67bd65
lavfi/drawutils: fix blending computation in blend_line function
...
If width is not alligned with hsub, background component should only be
multiplied once by sub alpha component.
2013-01-05 13:08:02 +01:00
Stefano Sabatini
0140566359
lavfi: add histeq filter
...
This is a port of virtual dub's histogram equalization filter by Donald
A. Graft. Based on the work by Jérémy Tran <tran.jeremy.av@gmail.com>,
done for SOCIS 2012.
2013-01-05 10:25:32 +01:00
Stefano Sabatini
172505b8bc
lavfi: add kerndeint filter
...
This is a port of the kerndeint filter (libmpcodecs/vf_kerndeint) by
Donal A. Graft (original avisynth plugin author), and is based on the
work by Jérémy Tran <tran.jeremy.av@gmail.com> done for SOCIS 2012.
2013-01-05 10:25:32 +01:00
Matthieu Bouron
bbab9cceb9
lavfi/drawutils: fix typo
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-05 05:21:44 +01:00
Stefano Sabatini
cb8d3965fd
lavfi/yadif: add support to named constants
2013-01-04 11:48:54 +01:00
Stefano Sabatini
f7dc6aa6b1
lavfi/yadif: add support to named options and options introspection
...
Also rename the "enable_auto" field to "deint", to match the name of the
option.
2013-01-04 11:48:54 +01:00
Stefano Sabatini
8674597fe5
lavfi/yadif: remove redundant NULL checks in uninit
2013-01-04 11:48:53 +01:00
Stefano Sabatini
4ea7c17932
lavfi/yadif: fail during the configuration stage in case of invalid video size
...
This is better than repeatedly failing during the filtering stage.
2013-01-04 11:48:53 +01:00
Stefano Sabatini
b52c1d0c99
lavfi/yadif: remove unused poll_frame callback
2013-01-04 11:48:53 +01:00
Clément Bœsch
491ca0e89f
Replace references to "que" with the appropriate word.
...
"que" sounds like a slang word to me. This commit renames a few
variables, fix the comments and the logging messages (sometimes along
with small other typo fixes).
2013-01-03 00:21:47 +01:00
Nicolas George
b99bef17b4
lavfi/avfiltergraph: check pick_format return code.
2013-01-02 16:56:03 +01:00
Paul B Mahol
ba1cbf40ce
lavfi/lut: use ff_fill_rgba_map()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-01-01 17:07:57 +00:00
Nicolas George
82541d8330
lavfi: merge all filtering code into ff_filter_frame.
2013-01-01 15:19:04 +01:00
Paul B Mahol
8e4e532bb2
lavfi/avcodec: fix typo
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-01-01 12:57:07 +00:00
Nicolas George
2eb2e1798e
lavfi: add avfilter_get_audio_buffer_ref_from_arrays_channels.
...
It is the same as avfilter_get_audio_buffer_ref_from_arrays
except it has a "channels" and the channel layout can be 0.
2013-01-01 02:01:28 +01:00
Nicolas George
11ab2c25b6
lavfi/avfiltergraph: print query_formats errors.
2012-12-31 18:43:04 +01:00
Michael Niedermayer
08196c785a
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
configure: suppress -fPIC in msvc builds
Drop unnecessary 'l' length modifier when printfing double values.
truemotion2: Sanitize tm2_read_header()
Conflicts:
libavcodec/truemotion2.c
libavfilter/src_movie.c
libavutil/opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-31 14:20:01 +01:00
Diego Biurrun
bcb8d9eb8f
Drop unnecessary 'l' length modifier when printfing double values.
...
%f denotes a double argument and 'l' does nothing in this case
according to the C spec.
2012-12-31 11:20:45 +01:00
Clément Bœsch
8d06e83d16
lavfi/Makefile: add missing dependencies to FFLIBS.
2012-12-31 01:40:34 +01:00
Clément Bœsch
21b6991cd5
lavfi/Makefile: make FFLIBS list consistent.
2012-12-31 01:38:31 +01:00
Nicolas George
c36302a7a4
lavfi/sink_buffer: switch to filter_frame.
2012-12-30 18:29:57 +01:00
Nicolas George
a978c04e22
lavfi/video: ensure that filter_frame is called.
...
This is a temporary workaround until all filters have been
upgraded to filter_frame and the framework can forget completely
about start_frame/draw_slice/end_frame.
2012-12-30 18:29:57 +01:00
Michael Niedermayer
b84871b8eb
vf_tinterlace: dont mix declarations and expressions
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-30 16:59:52 +01:00
Michael Niedermayer
c0c0b19644
lavfi: remove some draw_slice related code that has become unneeded
...
Reviewed-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-30 16:58:50 +01:00
Mark Himsley
8997a0fa79
lavfi/tinterlace: add low-pass-filter for top/bottom interleave modes
...
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2012-12-30 15:19:23 +01:00
Michael Niedermayer
3cd137bfea
vf_deshake: fix strict aliassing errors
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-29 20:00:48 +01:00
Michael Niedermayer
53228f47d6
avf_concat: init pointers to NULL for saftey and to avoid warning of uninitialized use.
...
Reviewed-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-29 18:56:33 +01:00
Michael Niedermayer
981baf742c
lavfi: replace REGISTER_BUILTIN_FILTER() by REGISTER_FILTER_UNCONDITIONAL()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-29 15:37:05 +01:00
Michael Niedermayer
83d4a8442c
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
cosmetics: Prettyprint codec/format/filter registration files
Conflicts:
libavcodec/allcodecs.c
libavdevice/alldevices.c
libavfilter/allfilters.c
libavformat/allformats.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-29 14:27:38 +01:00
Michael Niedermayer
2a9443a110
Merge commit '69583bd3b1eba471366141c945030c163e073e02'
...
* commit '69583bd3b1eba471366141c945030c163e073e02':
avfilter: Refactor unconditional filter registration
build: Add rtpenc_chain extra config option
configure: Add --disable-all command line option
Conflicts:
libavfilter/allfilters.c
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-29 13:05:37 +01:00
Diego Biurrun
c73c87b412
cosmetics: Prettyprint codec/format/filter registration files
2012-12-28 19:18:13 +01:00
Diego Biurrun
69583bd3b1
avfilter: Refactor unconditional filter registration
2012-12-28 19:18:13 +01:00
Michael Niedermayer
8afe168c78
vf_divtc: dont mix av_strdup and free
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-28 17:05:19 +01:00
Michael Niedermayer
baa5d6df77
vf_detc: dont mix av_strdup & free
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-28 17:04:54 +01:00
Michael Niedermayer
458afd2a0e
vf_mp: fix 'discards const qualifier from pointer target type'
...
args are not supposed to be changed by filters even if the argument is
not marked as const.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-28 17:00:01 +01:00
Clément Bœsch
ceee4407e3
lavfi/tile: small align cosmetics.
2012-12-26 21:32:38 +01:00
Clément Bœsch
4cd724daee
lavfi/tile: remove usage of link->{cur,out}_buf.
2012-12-26 21:30:46 +01:00
Clément Bœsch
3b870f973e
lavfi/scale: remove usage of link->cur_buf.
2012-12-26 21:30:45 +01:00
Clément Bœsch
a612e86ea6
lavfi/deshake: remove usage of link->cur_buf.
2012-12-26 21:30:45 +01:00
Clément Bœsch
5673a0102a
lavfi/decimate: remove usage of link->cur_buf.
2012-12-26 21:30:45 +01:00
Clément Bœsch
33e0eb5109
lavfi/video: remove unused ff_inplace_start_frame().
2012-12-26 21:30:45 +01:00
Paul B Mahol
c46cfedf09
build: mp filter does not depend on postproc anymore
...
This fixes testprogs build target if libpostproc is disabled.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-12-26 19:14:07 +00:00
Michael Niedermayer
a2349dc3f0
vf_idet: fix type of stats
...
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-26 17:27:28 +01:00
Clément Bœsch
d155abd1fc
lavfi/idet: remove unused assert include.
2012-12-26 17:17:36 +01:00
Clément Bœsch
a7f0af1b9a
lavfi/idet: remove unecessary context assignment.
2012-12-26 17:17:36 +01:00
Clément Bœsch
43cbd4406e
lavfi/idet: support named parameters.
...
The parameters are currently not documented in doc/filters.texi, but now
they at least appear in the automatic help.
2012-12-26 17:17:36 +01:00
Clément Bœsch
915d7487d7
lavfi/idet: remove unecessary poll_frame callback.
2012-12-26 17:17:36 +01:00
Stefano Sabatini
e06c147581
lavfi/aresample: fix style
...
Improve overall consistency/improve readability.
2012-12-26 11:56:35 +01:00
Hendrik Leppkes
8b6b3632fe
vf_pp: add postproc to the library dependencys for avfilter when enabled.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-25 15:49:27 +01:00
Michael Niedermayer
bd16f0a331
avfiltergraph: put variables used in #if 0 code themselfs under #if 0
...
Fixes unused variable warnings
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-24 22:35:27 +01:00
Michael Niedermayer
ba8e909c82
Merge commit '3193b13aa1e271f6d2dd68de67d448c08aef3c00'
...
* commit '3193b13aa1e271f6d2dd68de67d448c08aef3c00':
hlsenc: Allocate enough space for the pattern string
lavc: Correct the description of pkt_dts
avfilter: Compile FIFO filters unconditionally
Conflicts:
libavcodec/avcodec.h
libavfilter/Makefile
libavfilter/allfilters.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-24 15:29:15 +01:00
Clément Bœsch
768c47ec37
lavfi: remove mp=pp filter.
...
Native pp filter is available.
postproc dependency is also dropped from mp wrapper since it was the
only filter needing that dependency.
2012-12-23 19:03:36 +01:00
Clément Bœsch
9b8de93036
lavfi: add pp filter.
...
Ported from MPlayer. Original author is A'rpi, with various
contributions from Michael Niedermayer. The original documentation was
mostly written by Diego Biurrun. See the MPlayer history for full
credits.
The filter is under GPL like the original filter, even if it differs
quite a lot. There is not much point in making it LGPL since pp is under
GPL.
2012-12-23 19:03:36 +01:00
Diego Biurrun
5af53731d9
avfilter: Compile FIFO filters unconditionally
...
Building libavfilter without that functionality makes little sense.
2012-12-23 18:57:01 +01:00
Stefano Sabatini
bde1e8bf06
lavfi/overlay: make use of av_opt_set_from_string()
...
Simplify.
2012-12-22 16:14:23 +01:00
Stefano Sabatini
5e402a5319
lavfi/overlay: switch to filter_frame API
2012-12-22 16:12:26 +01:00
Paul B Mahol
185d1f3bfc
lavfi: declare arrays that never change as static const
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-12-21 22:38:59 +00:00
Paul B Mahol
a8ebb77493
lavfi/swapuv: use FFSWAP
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-12-21 19:04:11 +00:00
Michael Niedermayer
be2c0adc96
Merge commit '69f086e0f90f23d89e5739b099a4f984fa6a7885'
...
* commit '69f086e0f90f23d89e5739b099a4f984fa6a7885':
build: avfilter: Remove duplicate compilation entry for vf_scale
Conflicts:
libavfilter/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-21 17:39:03 +01:00
Diego Biurrun
69f086e0f9
build: avfilter: Remove duplicate compilation entry for vf_scale
...
vf_scale should not be unconditionally compiled even if disabled.
2012-12-21 00:18:34 +01:00
Nicolas George
c7a1239bf9
lavfi/af_aconvert: update audio->channels.
2012-12-20 17:01:35 +01:00
Nicolas George
0146c1f0f1
lavfi: remove init and check of rate and layout.
...
The sample rate and channel layout are negotiated and set
by the filter graph system.
2012-12-20 13:03:42 +01:00
Nicolas George
5033a1af17
lavfi/buffersrc: remove init of rate and layout.
...
The sample rate and channel layout are negotiated and set
by the filter graph system, the filters must not set them.
2012-12-20 13:03:42 +01:00
Nicolas George
34de47aa35
lavfi: add an accessor for ref->audio->channels.
2012-12-20 13:03:41 +01:00
Nicolas George
238edd2fe3
lavfi: add a channels field to AVFilterLink.
...
Also: fix af_pan and af_aresample, that forgot to update
audio->channels.
2012-12-20 13:03:41 +01:00
Clément Bœsch
174c483e2e
lavfi/select: fix compilation with avcodec disabled.
2012-12-20 05:17:36 +01:00
Stefano Sabatini
022e118e3f
lavfi/setpts: enable debug logs, and improve/extend debug messages
2012-12-19 11:49:54 +01:00
Clément Bœsch
de2022c5dd
lavfi/gradfun: small align cosmetics.
2012-12-19 03:22:58 +01:00
Clément Bœsch
526e2415bd
lavfi/gradfun: support named options.
...
This breaks usage for out-of-range values.
2012-12-19 03:13:26 +01:00
Clément Bœsch
3bdd70fc66
lavfi/gradfun: reduce up limit for threshold.
...
This will prevent an overflow in the SSSE3 and MMX filter_line code:
delta is expressed as an u16 being shifted by 2 to the left. If it
overflows, having a strength not above 64 will make sure that m is set
to 0 (making the m*m*delta >> 14 expression void).
A value above 64 should not make any sense unless gradfun is used as a
blur filter.
2012-12-19 03:13:26 +01:00
Clément Bœsch
63e1fc2588
lavfi/gradfun: remove rounding to match C and SSE code.
...
There is no noticable benefit for such precision.
2012-12-19 03:13:25 +01:00
Clément Bœsch
60ba9a9a88
lavfi/gradfun: fix dithering in MMX code.
...
Current dithering only use the first 4w instead of the whole 8 random values.
2012-12-19 03:13:25 +01:00
Clément Bœsch
49de902a1e
lavfi/gradfun: fix rounding in MMX code.
...
Current code divide before increasing precision.
2012-12-19 03:13:25 +01:00
Clément Bœsch
dd8a76ab08
lavfi/gradfun: do not increment DC pointer for odd values.
...
First DC is only used once otherwise. This also makes the code
consistent with ASM versions.
2012-12-19 03:13:25 +01:00
Michael Niedermayer
9700a7a1dd
af_apad: remove unneeded av_opt_free
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-18 17:31:01 +01:00
Michael Niedermayer
c311431e29
apad: add whole_len and pad_len options.
...
These options allow padding to a specific length or adding a specific amount if silence.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-18 17:30:31 +01:00
Michael Niedermayer
c2640146e0
apad: fix apad_options formating
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-18 17:16:03 +01:00
Michael Niedermayer
b7e085a288
af_apad: add user setable packet_size
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-18 17:01:33 +01:00
Michael Niedermayer
5eae7f8f35
avfilter: add apad filter
...
This filter pads an audio stream with silence
It can together with -shortest be used to extend audio streams to
the same length as video.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-18 16:30:08 +01:00
Stefano Sabatini
94877aad57
lavfi/crop: free x and y parsed expression objects
...
Fix leak introduced in 1e5492ffe6
.
2012-12-16 13:16:47 +01:00
Stefano Sabatini
1e5492ffe6
lavfi/crop: add support to option parsing
...
Also fix documentation accordingly.
2012-12-15 20:48:20 +01:00
Stefano Sabatini
54b0c04ae3
lavfi/overlay: clarify/fix comment, add a few empty lines to ease readability
2012-12-15 14:08:42 +01:00
Stefano Sabatini
3d1e2ada25
lavfi/overlay: remove duplicated definition of ff_null_get_video_buffer()
...
Simplify.
2012-12-15 13:51:24 +01:00
Stefano Sabatini
8f44170d30
lavfi/avfilter.h: clarify doxy for AVFilterLink.out_buf
2012-12-15 13:51:24 +01:00
Michael Niedermayer
be26232efa
Merge commit '07acdd651d1e2f4cfa5f610e616e70e323bb69cd'
...
* commit '07acdd651d1e2f4cfa5f610e616e70e323bb69cd':
ivi_common: use proper logging context in ivi_decode_blocks().
ivi_common: make some functions and tables static.
asyncts: ignore min_delta only if first_pts is set
Conflicts:
libavcodec/ivi_common.c
libavcodec/ivi_common.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-14 15:56:56 +01:00
Michael Niedermayer
a01fe55077
Merge commit 'c0dc57f1264dad1e121772d03abdb9e14ed8857f'
...
* commit 'c0dc57f1264dad1e121772d03abdb9e14ed8857f':
asyncts: merge two conditions
x86inc: fully concatenate tokens to fix macro expansion for nasm
h264: initialize frame-mt context copies properly
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-14 15:43:46 +01:00
Michael Niedermayer
b9d887c225
Merge commit '072be3e8969f24113d599444be4d6a0ed04a6602'
...
* commit '072be3e8969f24113d599444be4d6a0ed04a6602':
h264: set parameters from SPS whenever it changes
asyncts: cosmetics: reindent
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-14 15:17:51 +01:00
Michael Niedermayer
b6e7041f90
Merge commit 'b35e5d985dd12acf9a0aaa52334134edcf35d68e'
...
* commit 'b35e5d985dd12acf9a0aaa52334134edcf35d68e':
doc: improve documentation for the asyncts filter first_pts option
asyncts: fix the asyncts behavior when using the first_pts option
Conflicts:
libavfilter/af_asyncts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-14 13:58:12 +01:00
Michael Niedermayer
593f5c0f3c
Merge commit '8083332c2de9ee189f96844ff4c2d9be1844116f'
...
* commit '8083332c2de9ee189f96844ff4c2d9be1844116f':
asyncts: use clipped delta value when setting resample compensation
asyncts: fix flushing of final samples at EOF
vp6: properly fail on unsupported feature
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-14 13:51:20 +01:00
Justin Ruggles
c0dc57f126
asyncts: merge two conditions
2012-12-13 18:51:56 -05:00
Justin Ruggles
4e5a8878d5
asyncts: ignore min_delta only if first_pts is set
2012-12-13 18:51:56 -05:00
Justin Ruggles
8083332c2d
asyncts: use clipped delta value when setting resample compensation
...
The max_comp option is supposed to limit maximum compensation, but
currently the clipped value is not actually used.
2012-12-13 13:02:21 -05:00
Justin Ruggles
0ee440fe38
asyncts: cosmetics: reindent
2012-12-13 13:02:21 -05:00
Justin Ruggles
c143de40c3
asyncts: fix the asyncts behavior when using the first_pts option
...
Currently it will do padding, but it does not properly handle
start-of-stream trimming as documented.
2012-12-13 13:02:21 -05:00
Justin Ruggles
f266486b2e
asyncts: fix flushing of final samples at EOF
2012-12-13 13:02:21 -05:00
Michael Niedermayer
616e6ffac6
aresample: increase n_out buffer size a bit to reduce delay in some corner cases
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-13 18:17:48 +01:00
Michael Niedermayer
db6e960450
lavfi: drop ff_null_start_frame/end_frame/draw_slice.
...
The functions have become unused
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-13 03:38:16 +01:00
Stefano Sabatini
43912625e0
lavfi/select: assign NAN to ignored values
...
Also log scene value. Improve debugging.
2012-12-13 00:18:49 +01:00
Stefano Sabatini
6ba1f28008
lavfi/select: add support to options
...
Add options introspection, and improve error feedback.
2012-12-13 00:16:30 +01:00
Stefano Sabatini
c214cd18e2
lavfi/select: in select_frame(), rename picref -> ref
...
The variable is now used also for audio frames.
2012-12-13 00:12:55 +01:00
Stefano Sabatini
c51f090ff9
lavfi: mv vf_select.c -> f_select.c
...
The file now contains also an audio select implementation. Also move the
aselect/select documentation from video filters to the multimedia filters
section.
2012-12-13 00:10:43 +01:00
Stefano Sabatini
f5461face5
lavfi: add aselect audio variant of select
2012-12-13 00:10:24 +01:00
Stefano Sabatini
64c5fbd7de
lavfi/select: remove deprecated and unused poll_frame() callback
...
Simplify.
2012-12-13 00:03:50 +01:00
Michael Niedermayer
02b238186a
avfilter_get_audio_buffer_ref_from_frame: check that layout and channels match if they are set
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-12 17:46:05 +01:00
Michael Niedermayer
e69e780cde
ff_copy_buffer_ref: use the channel count
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-12 14:12:47 +01:00
Michael Niedermayer
5a4eb6aa27
avfilter_get_video_buffer_ref_from_frame: check channel count
...
more than 8 channels is not supported and crashes with null pointer dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-12 14:12:47 +01:00
Clément Bœsch
9138f6da4a
lavfi/showinfo: check plane count before dereferencing.
2012-12-12 02:55:10 +01:00
Clément Bœsch
4b4f16cdc0
lavfi/fps: remove parse opt error message.
...
See cc650cf0
for more info.
2012-12-11 18:14:08 +01:00
Clément Bœsch
0e0e3db189
lavfi/fps: add shorthand.
2012-12-11 18:12:11 +01:00
Clément Bœsch
fd3cdcaf5f
lavfi: remove mp=denoise3d filter.
...
hqdn3d was meant to be a more efficient denoise3d filter, is supported
natively, and is faster on my computer thanks to the ASM optimisations.
2012-12-11 04:28:08 +01:00
Clément Bœsch
18d9398143
doxy: add ref for lavfi, lpp and lsws.
2012-12-11 02:13:43 +01:00
Michael Niedermayer
b11a889055
vf_tinterlace: default of mode switch is impossible, add assert.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-11 00:03:23 +01:00
Stefano Sabatini
642a60f1c2
lavfi/setfield: add support to named options and introspection
2012-12-08 18:26:32 +01:00
Matthieu Bouron
7f154bd54f
lavfi/setfield: switch to filter_frame API
...
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2012-12-08 17:19:17 +01:00
Matthieu Bouron
4cd40ef343
lavfi/idet: switch to filter_frame API
...
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2012-12-08 17:19:17 +01:00
Stefano Sabatini
5825e9425b
lavfi/version: remove unused dropped symbol
2012-12-08 16:04:09 +01:00
Stefano Sabatini
10db70d5e9
lavfi: drop af_volume_stefano.c in favor of af_volume_justin.c
...
Justin's version has more features but is otherwise equivalent from the
point of view of the syntax.
2012-12-08 15:40:07 +01:00
Stefano Sabatini
769546631c
lavfi/volume_justin: add support to option shorthands and introspection
2012-12-08 15:22:55 +01:00
Stefano Sabatini
402ac72bbc
lavfi/volume_justin: fix a few grammar inconsistencies in options description
2012-12-08 15:22:55 +01:00
Stefano Sabatini
35e81441fc
lavfi/sendcmd: switch to filter_frame API
2012-12-08 12:10:40 +01:00
Stefano Sabatini
3eae531de2
lavfi/swapuv: switch to filter_frame API
2012-12-08 12:10:34 +01:00
Stefano Sabatini
fe508f807a
lavfi/alphaextract: consistently prefer "cur" over "in" in filter_frame()
...
Improve consistency/readability.
2012-12-07 19:45:34 +01:00
Stefano Sabatini
0bc0d31b7b
lavfi/alphaextract: access outlink properties rather than out_buf->video
...
Avoid one dereference, simplify.
2012-12-07 19:45:27 +01:00
Stefano Sabatini
130c6497d2
lavfi/alphaextract: fix assignment of invalid size value to memcpy in case linesize < 0
...
Fix crash, for example in the command:
ffmpeg -f image2 -vcodec pgmyuv -i tests/vsynth1/%02d.pgm \
-vf "[in]format=yuv420p,split,alphamerge,split[o3][o4];
[o4]vflip,alphaextract[alpha];[o3][alpha]alphamerge[out]" \
-vcodec rawvideo -f nut md5:
2012-12-07 19:43:19 +01:00
Stefano Sabatini
c3ad91a3d7
lavfi/alphaextract: switch to filter_frame() API
2012-12-07 19:42:59 +01:00
Stefano Sabatini
1f467220cf
lavfi/alphaextract: drop cur_linesize = out_linesize branch in draw_slice()
...
The code causes uninitialized data copy, and may be actually slower than
a loop over each line in case the padding is big.
2012-12-07 19:09:47 +01:00
Carl Eugen Hoyos
24b20087bd
Fix compilation with yasm 0.6.2.
2012-12-07 00:26:45 +01:00
Stefano Sabatini
da9a45b681
lavfi/tinterlace: drop redundant NULL checks in uninit()
2012-12-06 22:32:03 +01:00
Stefano Sabatini
c6a216771f
lavfi/tinterlace: add support to option parsing
...
Simplify code, and provide introspection through the AVOption system.
2012-12-06 22:31:42 +01:00
Stefano Sabatini
fef7b2e0be
lavfi/tinterlace: switch to filter_frame API
...
Also add missing NULL checks.
2012-12-06 22:30:59 +01:00
Clément Bœsch
bbd44f6ca4
lavfi/mp: switch to ff_filter_frame.
2012-12-06 21:11:28 +01:00
Clément Bœsch
eaa47e7454
lavfi/deshake: small align prettifying.
2012-12-06 16:20:31 +01:00
Clément Bœsch
03778575b9
lavfi/deshake: switch inverted comments.
2012-12-06 16:20:31 +01:00
Clément Bœsch
0678641b7c
lavfi/deshake: remove unecessary check before unref.
2012-12-06 16:20:31 +01:00
Clément Bœsch
e7b0e83e96
lavfi/deshake: switch to filter_frame.
2012-12-06 16:20:31 +01:00
Michael Niedermayer
54a71f2e6c
Merge commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56'
...
* commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56':
pixdesc: fix yuva 10bit bit depth
avconv: deprecate the -vol option
x86: af_volume: add SSE2/SSSE3/AVX-optimized s32 volume scaling
x86: af_volume: add SSE2-optimized s16 volume scaling
Conflicts:
ffmpeg.c
tests/ref/lavfi/pixdesc
tests/ref/lavfi/pixfmts_copy
tests/ref/lavfi/pixfmts_null
tests/ref/lavfi/pixfmts_scale
tests/ref/lavfi/pixfmts_vflip
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-06 15:55:47 +01:00
Michael Niedermayer
1bb547192f
lavfi: rename af_volume to af_volume_stefano
...
This matches the naming style of the new af_volume_justin filter.
Note, Yes i would too prefer having one filter instead of 2.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-06 15:29:23 +01:00
Michael Niedermayer
b38c79bf23
Merge commit 'b384e031daeb1ac612620985e3e5377bc587559c'
...
* commit 'b384e031daeb1ac612620985e3e5377bc587559c':
lavfi: add volume filter
Conflicts:
Changelog
libavfilter/Makefile
libavfilter/af_volume.c
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-06 15:18:59 +01:00
Clément Bœsch
a0b2e8e155
lavfi/silencedetect: use eval builtin to parse dB.
...
Also update FATE test to use the dB form.
2012-12-06 15:08:38 +01:00
Stefano Sabatini
c3fa6add58
lavfi/field: switch to filter_frame API
2012-12-06 13:51:34 +01:00
Stefano Sabatini
3942294fd5
lavfi/drawtext: make use of outlink variable in filter_frame()
...
Fix warning.
2012-12-06 13:51:27 +01:00
Clément Bœsch
1e85fd6a47
lavfi/mp: remove dead extern vf_info_t declarations.
2012-12-06 12:52:58 +01:00
anonymous
de42d2a347
lavfi/mp: add ff_ prefix to exported symbols
2012-12-06 12:38:37 +01:00
Justin Ruggles
b384e031da
lavfi: add volume filter
...
Based on the volume filter in FFmpeg written by Stefano Sabatini
<stefasab@gmail.com>.
2012-12-05 11:23:37 -05:00
Justin Ruggles
b30a363331
x86: af_volume: add SSE2/SSSE3/AVX-optimized s32 volume scaling
2012-12-05 11:23:37 -05:00
Justin Ruggles
f96f1e06a4
x86: af_volume: add SSE2-optimized s16 volume scaling
2012-12-05 11:23:37 -05:00
Michael Niedermayer
99efd59626
Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'
...
* commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967':
Remove pointless #undefs of previously forbidden functions.
fate: Add dependencies for bmp, cdxl, dfa, mp3
Conflicts:
doc/examples/muxing.c
libavfilter/filtfmts.c
libavutil/des.c
libavutil/eval.c
libavutil/log.c
libavutil/parseutils.c
tests/fate/mp3.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-05 13:34:45 +01:00
Clément Bœsch
ab5497df15
lavfi/subtitles: 10l close codec before format.
...
Fix invalid memory accesses.
2012-12-04 23:56:02 +01:00
Anton Khirnov
cb45553f57
Remove pointless #undefs of previously forbidden functions.
2012-12-04 21:40:22 +01:00
Nicolas George
0444733b78
lavfi/drawtext: add the reload option.
2012-12-04 19:06:22 +01:00
Clément Bœsch
359cd12a43
lavfi/mp: fix invalid read with filters with no argument.
2012-12-04 03:47:16 +01:00
Clément Bœsch
ef1868351d
lavfi/removelogo: switch to ff_filter_frame.
2012-12-04 02:31:40 +01:00
Clément Bœsch
3313e46c4a
lavfi: add subtitles filter.
2012-12-04 01:49:03 +01:00
Clément Bœsch
b5eb630e21
lavfi: remove some video w/h settings after avfilter_copy_buffer_ref_props.
...
video->[wh] will be set with the same values as the input after
avfilter_copy_buffer_ref_props. These filters don't change the size of
the input so there is no need for this code.
2012-12-03 21:47:03 +01:00
Clément Bœsch
d91388367f
lavfi/gradfun: remove check for AV_PERM_PRESERVE.
...
This check does not make sense in this context, see
doc/filter_design.txt for details about the usage of such flag.
2012-12-03 20:38:29 +01:00
Stefano Sabatini
5148147b26
lavfi/bbox: switch to ff_filter_frame() API
2012-12-02 18:13:49 +01:00
Stefano Sabatini
255be0734d
lavfi/alphamerge: fix leak introduced in 217163eb
2012-12-02 18:04:57 +01:00
Nicolas George
ddd87236f0
lavfi/vf_super2xsai: fix output ref size.
2012-12-02 17:08:17 +01:00
Stefano Sabatini
bd465fdc73
lavfi/framestep: switch to ff_filter_frame API
2012-12-02 15:02:05 +01:00
Stefano Sabatini
fbc339ff41
lavfi/super2xsai: switch to ff_filter_frame() API
2012-12-02 15:01:56 +01:00
Clément Bœsch
adfd9ca3fa
lavfi/hue: move to ff_filter_frame.
2012-12-02 14:44:31 +01:00
Nicolas George
24cb1f9718
lavfi/vf_tile: forward errors.
2012-12-02 13:53:41 +01:00
Nicolas George
3b316247fb
lavfi/vf_tile: cosmetic after last commit.
2012-12-02 13:53:41 +01:00
Nicolas George
6f3d2fb18b
lavfi/vf_tile: switch to filter_frame.
...
Also add error check on buffer allocation.
2012-12-02 13:53:41 +01:00
Stefano Sabatini
3d72820722
lavfi/decimate: switch to ff_filter_frame() API
2012-12-02 12:42:29 +01:00
Stefano Sabatini
217163eb98
lavfi/alphamerge: switch to ff_filter_frame() API
2012-12-02 12:42:29 +01:00
Stefano Sabatini
83ab46a57e
lavfi/blackdetect: switch to new ff_filter_frame() API
2012-12-02 12:42:29 +01:00
Clément Bœsch
9e1914dfba
lavfi/hqdn3d: avoid use of uninitialized variable.
2012-12-02 02:53:22 +01:00
Clément Bœsch
a3554bb457
lavfi/gradfun: avoid use of uninitialized variable.
2012-12-02 02:42:07 +01:00
Clément Bœsch
f61369d762
lavfi/vsrc: switch to ff_filter_frame.
2012-12-02 00:23:45 +01:00
Stefano Sabatini
13c39e9676
lavfi/geq: add T variable and example
2012-12-01 16:05:15 +01:00
Clément Bœsch
a7eabbb20d
lavfi/concat: prefer av_asprintf() over stack allocated buffer.
2012-11-29 12:55:56 +01:00
Clément Bœsch
b99f1303ad
lavfi/concat: switch to filter_frame.
2012-11-29 12:55:56 +01:00
Clément Bœsch
ea3bad0e9e
lavfi/smartblur: switch to filter_frame.
2012-11-29 12:49:03 +01:00
Clément Bœsch
9262f13269
lavfi/show{spectrum,waves}: use ff_filter_frame().
2012-11-29 11:44:20 +01:00
Michael Niedermayer
3fd8e07265
vsrc_mandelbrot: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 05:52:31 +01:00
Clément Bœsch
9236e9f1e1
lavfi/ebur128: use ff_filter_frame() everywhere.
2012-11-29 03:48:14 +01:00
Michael Niedermayer
1eb8809a41
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
vf_fieldorder: require write permissions
vf_fieldorder: reindent
Conflicts:
libavfilter/vf_fieldorder.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 02:54:50 +01:00
Michael Niedermayer
87b9dc0982
Merge commit '565e4993c63f797e2d50ad2f1e8f62fdbe299666'
...
The commit has already been split and commited, this merge is just for metadata.
What has not been merged is the removial of some start/end_frame / draw_slice
related functions that are still in use. They can be removed once they are
unused.
* commit '565e4993c63f797e2d50ad2f1e8f62fdbe299666':
lavfi: merge start_frame/draw_slice/end_frame
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 02:51:22 +01:00
Clément Bœsch
031d644878
lavfi/ass: switch to filter_frame.
2012-11-29 02:36:34 +01:00
Anton Khirnov
9178235ffb
avfilter: mark start_frame/end_frame/draw_slice as deprecated
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 02:30:11 +01:00
Clément Bœsch
502ecc9cc2
lavfi/colormatrix: 10l fix forgotten buffer unref.
2012-11-29 02:21:16 +01:00
Clément Bœsch
269cd07702
lavfi/colormatrix: switch to filter_frame.
2012-11-29 02:16:33 +01:00
Anton Khirnov
88f8af26a9
vf_format: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 02:09:40 +01:00
Anton Khirnov
7c42814782
vf_copy: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 02:09:22 +01:00
Anton Khirnov
ece5decbe0
vf_null: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 02:09:01 +01:00
Michael Niedermayer
015c2b4066
libavfilter: default to filter_frame when neither it nor start/slice/end is set.
...
this is needed for vf_null and a few others.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 02:08:49 +01:00
Anton Khirnov
60e50dd960
buffersrc: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 01:55:26 +01:00
Anton Khirnov
b5ecfa1d8d
buffersink: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 01:55:26 +01:00
Clément Bœsch
5d796270c5
lavfi/thumbnail: re-use ctx instead of inlink->dst.
2012-11-29 01:43:28 +01:00
Clément Bœsch
782993d9e4
lavfi/thumbnail: use avfilter_unref_bufferp() where appropriate.
2012-11-29 01:38:08 +01:00
Clément Bœsch
24f425319d
lavfi/thumbnail: switch to filter_frame.
2012-11-29 01:34:55 +01:00
Anton Khirnov
69d4420aea
libavfilter/split: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 01:20:53 +01:00
Michael Niedermayer
94fdef818e
vf_scale: switch to filter_frame
...
Based on patch by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 01:20:53 +01:00
Clément Bœsch
3860e34b08
lavfi/sendcmd: expose the options for both filters.
2012-11-29 00:52:00 +01:00
Clément Bœsch
0b70ffa4ac
lavfi/sendcmd: add FLAGS to AVOption array.
2012-11-29 00:50:37 +01:00
Clément Bœsch
a5b765236b
lavfi: add priv_class for some forgotten filters.
...
This allows to print the options available when using commands such as
ffmpeg -help full.
2012-11-29 00:50:37 +01:00
Clément Bœsch
8a12c96d27
lavfi/mptestsrc: add FLAGS to AVOption array.
2012-11-29 00:50:37 +01:00
Anton Khirnov
0a767ad796
vf_blackframe: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 00:32:08 +01:00
Anton Khirnov
8f21cfc6b3
vf_aspect: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 00:31:50 +01:00
Anton Khirnov
aa61728d0a
vf_cropdetect: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 00:15:56 +01:00
Anton Khirnov
71f82c3805
vf_crop: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 00:15:40 +01:00
Anton Khirnov
a42b89910b
vf_drawbox: switch to filter frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 00:09:53 +01:00
Anton Khirnov
267290ce3b
vflip: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 00:09:31 +01:00
Michael Niedermayer
8c1f98d954
Merge commit 'bb6c67bb36b136de10256f0999128df4a42f9ffc'
...
* commit 'bb6c67bb36b136de10256f0999128df4a42f9ffc':
lavfi: remove vf_slicify
Conflicts:
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/vf_slicify.c
tests/lavfi-regression.sh
tests/ref/lavfi/crop_scale_vflip
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 23:59:15 +01:00
Anton Khirnov
5f648ce43e
vf_yadif: switch to filter_frame, this filter did not support slices
...
signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 23:47:01 +01:00
Anton Khirnov
9a65b8c0a2
vf_fade: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 23:47:01 +01:00
Clément Bœsch
2d9d444051
lavfi: convert remaining input/output list compound literals to named objects.
...
This is following 568c70e79e
.
2012-11-28 23:19:20 +01:00
Anton Khirnov
bff576c779
vf_lut: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 22:39:35 +01:00
Anton Khirnov
eb7e7e82e1
vf_hflip: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 22:39:16 +01:00
Anton Khirnov
dabb993c44
f_setpts: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 22:27:51 +01:00
Anton Khirnov
bb56436cfd
f_settb: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 22:19:43 +01:00
Michael Niedermayer
eb1424b4fe
src_movie: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 21:58:45 +01:00
Anton Khirnov
f7f6f281dd
vsrc_testsrc: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 21:58:39 +01:00
Anton Khirnov
c262e8cff6
vsink_nullsink: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 21:49:04 +01:00
Anton Khirnov
45eed9b197
vf_unsharp: switch to filter_frame, this filter did not support slices
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 21:47:39 +01:00
Michael Niedermayer
afded1816b
vf_transpose: switch to filter_frame
...
Based on patch by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 21:46:23 +01:00
Anton Khirnov
2c3b665379
vf_select: switch to filter_frame
...
The new code reads the input frame when its ready, the previous
code did read the input frame during start_frame at which point it
may not yet be available.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 21:28:02 +01:00
Anton Khirnov
0663a9eab8
vf_showinfo: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 21:28:02 +01:00
Michael Niedermayer
6be0df5080
vf_pad: switch to filter_frame
...
Based on patch by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 21:28:02 +01:00
Michael Niedermayer
e42b7ff2b2
vf_pixdesctest: switch to filter_frame
...
Based on patch by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 20:25:55 +01:00
Anton Khirnov
1f94f86ab5
vf_libopencv: switch to filter_frame, this filter did not support slices
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 20:25:55 +01:00
Clément Bœsch
5d170b09d3
lavfi/geq: switch to filter_frame.
2012-11-28 20:20:40 +01:00
Anton Khirnov
2a06bc10e7
vf_gradfun: switch to filter_frame, this filter did not support slices
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 20:06:06 +01:00
Anton Khirnov
6325957b28
vf_frei0r: switch to filter_frame, the filter did not support slices
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 20:06:06 +01:00
Clément Bœsch
57d9c86bf3
lavfi/edgedetect: switch to filter_frame.
2012-11-28 20:03:01 +01:00
Anton Khirnov
92b57e8dac
vf_fps: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 19:28:41 +01:00
Anton Khirnov
e67fdbffe5
vf_fieldorder: switch to filter_frame, this filter did not support real slices
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 19:23:32 +01:00
Michael Niedermayer
59907340e1
libavfilter/fifo: fix indent
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 19:18:24 +01:00
Michael Niedermayer
b5572ab861
vf_boxblur: cosmetics to reduce diff to qatar
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 19:18:24 +01:00
Michael Niedermayer
7bfa2f25c0
vf_drawtext: switch to filter_frame, this filter did not support slices
...
Based on patch by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 18:07:51 +01:00
Michael Niedermayer
384641468b
vf_delogo: switch to filter_frame, this filter did not support slices
...
Based on patch by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 18:07:33 +01:00
Michael Niedermayer
ed547e2ce5
vf_hqdn3d: fix permissions
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 18:05:09 +01:00
Michael Niedermayer
46a4e72bc5
vf_delogo: fix order of operations in apply_delogo()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 18:03:03 +01:00
Anton Khirnov
250b122e3a
vf_boxblur: switch to filter_frame, boxblur did not support slices
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 17:33:42 +01:00
Anton Khirnov
05945c7f88
libavfilter/fifo: switch to filter_frame, the filter did not support slices.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 17:33:42 +01:00
Anton Khirnov
1b43fc127c
vf_hqdn3d: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 16:43:34 +01:00
Michael Niedermayer
8227a0b7df
libavfilter: update doxy for filter_frame
...
Based on patch by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 16:43:34 +01:00
Michael Niedermayer
3ed483cdfa
libavfilter: Support using filter_frame for video
...
With this we can mix filters using filter_frame OR start/draw_slice/end
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 16:43:34 +01:00
Michael Niedermayer
a0b8eec719
default_filter_frame: fix argument name
...
Based on code by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 16:43:34 +01:00
Michael Niedermayer
f6dd145533
avfilter: check that filter_frame and slice variants are not both used
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 16:43:34 +01:00
Michael Niedermayer
cd7febd33f
lavfi: replace filter_samples by filter_frame
...
Based on patch by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 16:43:34 +01:00
Michael Niedermayer
42d3fea65f
Merge commit 'af7d13ee4a4bf8d708f9b0598abb8f6e22b76de1'
...
* commit 'af7d13ee4a4bf8d708f9b0598abb8f6e22b76de1':
asink_nullsink: plug a memory leak.
x86: h264_idct: port to cpuflags
x86: cpu: Drop unused HAVE_RWEFLAGS condition
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 13:32:17 +01:00
Anton Khirnov
4c973de9a5
vf_fieldorder: require write permissions
...
This filter modifies the input frame.
2012-11-28 08:50:24 +01:00
Anton Khirnov
49dd71a6f1
vf_fieldorder: reindent
2012-11-28 08:50:24 +01:00
Anton Khirnov
565e4993c6
lavfi: merge start_frame/draw_slice/end_frame
...
Any alleged performance benefits gained from the split are purely
mythological and do not justify added code complexity.
2012-11-28 08:50:19 +01:00
Anton Khirnov
bb6c67bb36
lavfi: remove vf_slicify
...
The following commit will make it useless.
The crop_scale_vflip FATE test changes because of off-by-one differences
in output when vflipped slices are passed to sws.
2012-11-28 08:44:01 +01:00
Anton Khirnov
af7d13ee4a
asink_nullsink: plug a memory leak.
2012-11-28 08:43:54 +01:00
Stefano Sabatini
2ac6a3d1bf
lavfi/drawtext: add support to expansion of generic expressions
2012-11-27 23:27:50 +01:00
Mark Himsley
13c6252536
lavfi/overlay: enable yuva420p as overlay background
...
Same calculation as for RGBA etc to create unpremultiplied output.
Useful for creating an intermediate "Mix/Effects bank", in vision mixer
(switcher) terminology.
Example command:
ffmpeg -i input.mov -vf
"[in]scale=iw:ih:interl=1,format=yuv420p[bg];movie=BBC_blocks_watermark.png,scale=iw:ih:interl=1,format=yuva420p[dog];movie=Kickabout_strap.mov,scale=iw:ih:interl=1,format=yuva420p[strap];[strap][dog]overlay=0:0[me1];[bg][me1]overlay=0:0,scale=0:0:interl=1[out]"
-b:v 3M -an output.mov
Fix trac ticket #549 .
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2012-11-27 10:44:42 +01:00
Michael Niedermayer
8d231e37af
af_aresample: consistently use ROUNDED_DIV
...
This fixes issues with negative timestamps
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-26 21:09:15 +01:00
Michael Niedermayer
4b5a12a2cb
af_aresample: fix rounding of negative timestamps
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-26 16:25:47 +01:00
Michael Niedermayer
69d45d2ecb
avfiltergraph: add aresample_swr_opts
...
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-26 03:51:08 +01:00
Michael Niedermayer
8f507feecb
avfiltergraph: add AVOption table
...
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-25 14:36:22 +01:00
Michael Niedermayer
014058abea
af_aresample: check ff_get_audio_buffer() failure
...
Fixes null pointer dereference
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-24 17:33:32 +01:00
Michael Niedermayer
0efcf16a3e
replace av_log(0, by av_log(NULL,
...
The first parameter is a pointer and NULL is more correct
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-23 18:10:02 +01:00
Michael Niedermayer
c322f19855
vf_mandelbrot: give all av_log a context
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-23 18:05:16 +01:00
Stefano Sabatini
f67ebf5b77
lavfi/avfiltergraph: improve error message in graph_check_validity()
...
Fix trac ticket #1944 .
2012-11-22 13:14:20 +01:00
Stefano Sabatini
eb87b340e8
lavfi/drawtext: add support for printing frame numbers
...
Fix trac ticket #1949 .
2012-11-22 13:14:19 +01:00
Michael Niedermayer
494945cb66
Merge commit 'd1d9efaae6c7e8466b06c30ca21c6b569dd2e480'
...
* commit 'd1d9efaae6c7e8466b06c30ca21c6b569dd2e480':
avcodec: split avpicture from imgconvert
pixdesc: add PIX_FMT_ALPHA flag
Conflicts:
libavcodec/imgconvert.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-21 15:37:01 +01:00
Michael Niedermayer
c44a028e19
af_aresample: allocate at least 1 sample buffer. Fix null ptr dereference.
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-19 15:55:54 +01:00
Michael Niedermayer
27d39c225b
liavfi/avcodec: allow channel layouts with fewer channels than actually available.
...
This fixes the regression with Ticket1726, where some audio was lost.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-18 22:54:18 +01:00
Stefano Sabatini
158763312f
lavfi/frei0r: in init() check path loop, free resources in a single point
2012-11-18 16:52:46 +01:00
Stefano Sabatini
6c7ae49330
lavfi/frei0r: extend load_path() to support arbitrarily long paths
2012-11-18 16:52:46 +01:00
Clément Bœsch
f6be711a69
lavfi/mp/pp: use PP_CPU_CAPS_AUTO.
2012-11-18 16:21:59 +01:00
Nicolas George
c437c251b8
lavfi/drawtext: implement more generic expansion.
...
The new expansion mechanism uses the %{...} notation.
For compatibility reasons, it must be enabled explicitly,
but a warning is printed if a conflict is likely to happen.
2012-11-18 15:55:47 +01:00
Nicolas George
29e388abcb
lavfi/drawtext: use bprint for the expanded text.
2012-11-17 19:47:56 +01:00
Clément Bœsch
b3bf9b1d97
lavfi/geq: fix GPL license header.
...
100l: original code is GPL, header miscopied. LICENSE file and configure
dependency are fine.
2012-11-15 21:48:39 +01:00
Stefano Sabatini
334a0d15c6
lavfi/frei0r: add additional trailing slash in FREI0R_PATH paths
...
Allow to accept paths with no ending trailing slash.
Based on a patch by rogerdpack <rogerpack2005@gmail.com>.
2012-11-13 22:54:29 +01:00
Stefano Sabatini
9a2028d4f4
lavfi/frei0r: correctly handle paths longer than 1023 chars
2012-11-13 22:41:01 +01:00
Paul B Mahol
1acd2f6ba7
Replace rest of libavutil/audioconvert.h with libavutil/channel_layout.h
...
Also remove it in once case when it is not needed.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-11-13 13:21:21 +00:00
Stefano Sabatini
7945665200
lavfi: store and propagate number of channels information in audio buffer properties
...
The channels field is required since the channel layout is not always
available.
2012-11-13 12:15:27 +01:00
Michael Niedermayer
03b078721c
Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'
...
* commit '97bf7c03b1338a867da52c159a2afecbdedcfa88':
doc: git-howto: Leave reviewers time to react before pushing patches
Include libavutil/channel_layout.h instead of libavutil/audioconvert.h
lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h
Conflicts:
doc/APIchanges
doc/examples/decoding_encoding.c
doc/git-howto.texi
ffmpeg_filter.c
libavcodec/flacdec.c
libavcodec/imc.c
libavcodec/mpegaudiodec.c
libavcodec/utils.c
libavfilter/asrc_anullsrc.c
libavfilter/audio.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/buffer.c
libavutil/Makefile
libavutil/audioconvert.h
libavutil/channel_layout.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-12 11:32:11 +01:00
Clément Bœsch
3a7f00810c
lavfi: remove mp=geq filter.
...
Native geq video filter is now available.
2012-11-11 23:18:12 +01:00
Clément Bœsch
8eecbaf5e4
lavfi: add geq filter.
2012-11-11 23:12:54 +01:00
Clément Bœsch
2b3597f0d1
lavfi: remove mp=fixpts filter.
...
lavfi/f_setpts.c should allow everything mp=fixpts supports, with a lot
of additional control.
2012-11-11 22:49:53 +01:00
Clément Bœsch
84aed3faf0
lavfi: remove mp=tile filter.
...
The native tile video filter is now feature equivalent.
2012-11-11 22:43:18 +01:00
Clément Bœsch
7582012058
lavfi/tile: extend shorthand parameters.
...
This makes the syntax similar to mp=tile.
2012-11-11 22:43:18 +01:00
Clément Bœsch
4a90e7124d
lavfi/tile: add nb_frames option.
2012-11-11 22:43:18 +01:00
Clément Bœsch
ecfaff350f
lavfi/tile: add margin and padding options.
2012-11-11 22:43:17 +01:00
Clément Bœsch
aa5a029091
lavfi/tile: allow named arguments.
2012-11-11 22:43:17 +01:00
Justin Ruggles
a903f8f087
Include libavutil/channel_layout.h instead of libavutil/audioconvert.h
...
Also reorder some other #include when applicable.
2012-11-11 13:35:12 -05:00
Michael Niedermayer
47ca2487ae
lavfi/avcodec: check that injected avframes use a supported channel layout
...
This fixes out of array accesses.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-10 21:45:34 +01:00
Michael Niedermayer
a150bad406
lavfi/avcodec: check avfilter_copy_frame_props() return code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-10 21:37:40 +01:00
Stefano Sabatini
2b442ff5f5
lavfi/movie: return proper error code in case of av_get_token() allocation failure
...
Also slightly clarify logic, and should fix coverity issue CID 717771.
2012-11-06 23:31:16 +01:00
Stefano Sabatini
b5436f4b5d
lavfi/showwaves: return error in case of allocation failure in filter_samples()
2012-11-06 22:48:54 +01:00
Stefano Sabatini
5f634480d1
lavfi/showwaves: simplify check in filter_samples()
...
Also fix Coverity issue CID 733743: Dereference after null check
2012-11-06 22:48:17 +01:00
Michael Niedermayer
44e9d7f182
vf_drawbox: dont move uninitialized and then unused colors around
...
Fixes CID741419
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-06 21:40:23 +01:00
Paul B Mahol
e870a7dd4a
lavfi: stop using -1 instead use AV_PIX_FMT_NONE/AV_SAMPLE_FMT_NONE
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-11-05 13:34:08 +00:00
Stefano Sabatini
1ba2459fbb
lavfi/scale: declare the filter private class
...
Allow to show the supported options in the ffmpeg -h full output.
2012-11-04 18:01:16 +01:00
Michael Niedermayer
4a2599b0e6
transform: give avfilter_transform() a return value for returning an error
...
Fixes CID703674
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-04 01:30:16 +01:00
Stefano Sabatini
d034847f7a
lavfi/earwax: add missing NULL check in filter_samples()
2012-11-04 00:17:27 +01:00
Michael Niedermayer
37e81996dc
Merge commit '9221efef7968463f3e3d9ce79ea72eaca082e73f'
...
* commit '9221efef7968463f3e3d9ce79ea72eaca082e73f':
lavf: fix av_interleaved_write_frame() doxy.
lavf: clarify the lifetime of demuxed packets.
avconv: do not free muxed packet on streamcopy.
crc: move doxy to the header
vf_drawtext: do not use deprecated av_tree_node_size
x86: Refactor PSWAPD fallback implementations and port to cpuflags
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-03 14:24:11 +01:00
Michael Niedermayer
ac2a3a7a05
vf_tinterlace: check av_image_get_linesize() return value
...
Fixes CID703717
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-03 02:38:30 +01:00
Michael Niedermayer
03764f6735
af_earwax: remove unused pointer value
...
Fixes CID703849
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-03 02:38:23 +01:00
Anton Khirnov
b68aac7ea3
vf_drawtext: do not use deprecated av_tree_node_size
2012-11-02 18:28:55 +01:00
Michael Niedermayer
4695ee71b0
lavfi/fifo: add assert to ensure request was successfull.
...
We would crash a moment later anyway if this fails.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-01 18:02:23 +01:00
Michael Niedermayer
add7513e64
Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415'
...
* commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415':
x86: h264_chromamc_10bit: drop pointless PAVG %define
x86: mmx2 ---> mmxext in function names
swscale: do not forget to swap data in formats with different endianness
Conflicts:
libavcodec/x86/dsputil_mmx.c
libavfilter/x86/gradfun.c
libswscale/input.c
libswscale/utils.c
libswscale/x86/swscale.c
tests/ref/lavfi/pixfmts_scale
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-01 13:11:51 +01:00
Clément Bœsch
54a48d2f04
lavfi: fix references to avfilter_* functions that don't exist anymore.
2012-10-31 20:54:59 +01:00
Clément Bœsch
f53112b665
lavfi: remove hqdn3d libmpcodecs wrapper.
...
The native filter was ported from the MPlayer project when the mp
wrapper didn't even exist, and when mp=hqdn3d was added, it was already
obsolete.
2012-10-31 19:28:02 +01:00
Diego Biurrun
d8eda37080
x86: mmx2 ---> mmxext in function names
2012-10-31 17:53:57 +01:00
Stefano Sabatini
1b21642149
lavfi/scale: avoid to print a NULL value in log message
...
Fix possible crash occurring when libc does not support NULL printing.
2012-10-31 15:46:46 +01:00
Stefano Sabatini
29a9e4d5c9
lavfi/mp: drop the mp=rectangle filter
...
All the rectangle features have been ported to the native drawbox filter,
which has an equivalent syntax.
2012-10-31 14:46:18 +01:00
Stefano Sabatini
9d478f38cd
lavfi/drawbox: add "width" and "height" aliases for "w" and "h" options
2012-10-31 14:43:47 +01:00
Stefano Sabatini
93399e9381
lavfi/drawbox: add thickness option
2012-10-31 14:43:47 +01:00
Michael Niedermayer
9766d9c985
Merge commit '04581c8c77ce779e4e70684ac45302972766be0f'
...
* commit '04581c8c77ce779e4e70684ac45302972766be0f':
x86: yasm: Use complete source path for macro helper %includes
Conflicts:
Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-31 13:57:09 +01:00
Michael Niedermayer
3174616f59
Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73'
...
* commit '6860b4081d046558c44b1b42f22022ea341a2a73':
x86: include x86inc.asm in x86util.asm
cng: Reindent some incorrectly indented lines
cngdec: Allow flushing the decoder
cngdec: Make the dbov variable have the right unit
cngdec: Fix the memset size to cover the full array
cngdec: Update the LPC coefficients after averaging the reflection coefficients
configure: fix print_config() with broke awks
Conflicts:
libavcodec/x86/ac3dsp.asm
libavcodec/x86/dct32.asm
libavcodec/x86/deinterlace.asm
libavcodec/x86/dsputil.asm
libavcodec/x86/dsputilenc.asm
libavcodec/x86/fft.asm
libavcodec/x86/fmtconvert.asm
libavcodec/x86/h264_chromamc.asm
libavcodec/x86/h264_deblock.asm
libavcodec/x86/h264_deblock_10bit.asm
libavcodec/x86/h264_idct.asm
libavcodec/x86/h264_idct_10bit.asm
libavcodec/x86/h264_intrapred.asm
libavcodec/x86/h264_intrapred_10bit.asm
libavcodec/x86/h264_weight.asm
libavcodec/x86/vc1dsp.asm
libavcodec/x86/vp3dsp.asm
libavcodec/x86/vp56dsp.asm
libavcodec/x86/vp8dsp.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-31 13:43:33 +01:00
Stefano Sabatini
755038d07d
lavfi/drawbox: remove some unnecessary parentheses
2012-10-31 12:20:50 +01:00
Stefano Sabatini
003bd88d99
lavfi/drawbox: reindent after previous commit
2012-10-31 12:14:21 +01:00
Stefano Sabatini
1b3fdd9731
lavfi/drawbox: implement color=invert mode
...
Based on a libmpcodecs/vf_rectangle.c feature.
2012-10-31 12:14:21 +01:00
Stefano Sabatini
652fab5996
lavfi/mp: drop wrapped field filter
...
The filter has been ported to a native libavfilter filter.
2012-10-31 12:14:09 +01:00
Stefano Sabatini
3c4aa50620
lavfi: add field filter
...
The filter is a port of libmpcodecs/vf_field.c, since there is no common
code I relicensed it as LGPL, while keeping the original author
copyright.
2012-10-31 12:07:11 +01:00
Diego Biurrun
04581c8c77
x86: yasm: Use complete source path for macro helper %includes
...
This is more consistent with the way we handle C #includes and
it simplifies the build system.
2012-10-31 00:37:42 +01:00
Diego Biurrun
6860b4081d
x86: include x86inc.asm in x86util.asm
...
This is necessary to allow refactoring some x86util macros with cpuflags.
2012-10-31 00:37:42 +01:00
Stefano Sabatini
2ed7e6cce5
lavfi/drawbox: extend syntax, accept named options
2012-10-30 23:36:36 +01:00
Stefano Sabatini
b420b87848
lavfi/tinterlace: remove poll_frame() callback
...
That interface is deprecated, and apparently useless.
2012-10-30 23:32:20 +01:00
Paul B Mahol
7b378c2fb7
lavfi: remove yuvcsp and yvu9 libmpcodecs wrappers
...
Same functionality is provided by libswscale.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-10-30 21:24:29 +00:00
Clément Bœsch
03179c2426
lavfi/smartblur: add missing draw slice call.
...
This fixes output with filtergraphs such as 'split[a][b];
[a]pad=iw*2[src]; [b]smartblur=1:1:1[filt]; [src][filt]overlay=w'
2012-10-30 19:37:20 +01:00
Michael Niedermayer
5cac0656a3
af_ashowinfo: integrate config_input() in filter_samples.
...
This is simpler and also should allow the code to function when the
channel number changes.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-30 19:26:07 +01:00
Paul B Mahol
788afee86e
lavfi: remove palette libmpcodecs wrapper
...
The filter is useless, swscale should be used instead.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-10-30 16:21:33 +00:00
Michael Niedermayer
e79c3858b3
Merge commit '14f031d7ecfabba0ef02776d4516aa3dcb7c40d8'
...
* commit '14f031d7ecfabba0ef02776d4516aa3dcb7c40d8':
dv: use AVStream.index instead of abusing AVStream.id
lavfi: add ashowinfo filter
avcodec: Add a RFC 3389 comfort noise codec
lpc: Add a function for calculating reflection coefficients from samples
lpc: Add a function for calculating reflection coefficients from autocorrelation coefficients
lavr: document upper bound on number of output samples.
lavr: add general API usage doxy
indeo3: remove duplicate capabilities line.
fate: ac3: Add dependencies
Conflicts:
Changelog
doc/filters.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/version.h
libavfilter/Makefile
libavfilter/af_ashowinfo.c
libavfilter/allfilters.c
libavfilter/version.h
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-30 14:40:22 +01:00
Anton Khirnov
20dd41af85
lavfi: add ashowinfo filter
...
It can be useful for debugging.
Based on a patch by Stefano Sabatini <stefano.sabatini-lala@poste.it>
2012-10-29 21:29:58 +01:00
rogerdpack
c1804dc4ce
lavfi/frei0r: allow for Windows style paths
...
Update path handling against the latest Frei0r specification changes.
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2012-10-29 18:50:48 +01:00
Stefano Sabatini
7691860c73
lavfi/frei0r: update link to spec
...
Fri0r project moved from piksel.org to frei0r.dyne.org.
2012-10-29 18:48:00 +01:00
Stefano Sabatini
19add3224f
lavfi/scale: implement clever/insane parsing heuristic, and add a size option
...
If the first argument can be read as a video size, set that output size
in the scale. This allows to specify in a filtergraph scale=qcif or
scale=320x240.
This is not completely safe, for example in case of a typo in the video
size string the first argument will be read as the input width
expression, giving rise to a confusing comment.
2012-10-29 17:44:53 +01:00
Stefano Sabatini
c2428ada71
lavfi/scale: return error code in case of failed reconfiguration in start_frame()
...
Avoid an assert, since now the function supports error code return.
2012-10-29 17:39:26 +01:00
Stefano Sabatini
83938c3d4c
lavfi/scale: accept named options, make parsing more robust
...
Also update documentation accordingly.
2012-10-29 17:39:26 +01:00
Carl Eugen Hoyos
3f44809415
Synchronize libmpcodecs: Support 16bit yuv in telecine filter.
...
Fixes ticket 1782.
2012-10-28 15:46:35 +01:00
Michael Niedermayer
8943ad4014
Merge commit '4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26'
...
* commit '4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26':
avio: fix pointer type mismatches in avio_enum_protocols()
avserver: use socklen_t where appropriate
udp: use socklen_t where appropriate
network: use HAVE_THREADS instead of local hack
af_channelmap: remove stray enum declaration
buffersink: remove stray semicolon after function definition
Conflicts:
libavformat/avio.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-28 13:19:11 +01:00
Nicolas George
b0e2f4a757
lavfi/concat: implement unsafe mode.
2012-10-28 09:14:34 +01:00
Michael Niedermayer
2aecfd4f20
vf_showinfo: check return code of av_image_get_linesize()
...
Fixes CID703716
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-28 00:40:28 +02:00
Clément Bœsch
6078bd8024
lavf/showspectrum: fix unaligned rdft data.
2012-10-27 22:59:05 +02:00
Reimar Döffinger
5f9cbad603
Port MPlayer fixes for coverity issues in libmpcodecs.
...
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2012-10-27 17:52:41 +02:00
Mans Rullgard
67a68dcec2
af_channelmap: remove stray enum declaration
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-10-27 13:06:43 +01:00
Mans Rullgard
6b776c61da
buffersink: remove stray semicolon after function definition
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-10-27 13:06:27 +01:00
Michael Niedermayer
507f2940cc
Merge commit '1b891d17c531e8a63c2974aab4bf997ce70746f3'
...
* commit '1b891d17c531e8a63c2974aab4bf997ce70746f3':
avconv: fix bitrate report when writing to /dev/null
avfilter: fix graphparser memleaks on error paths
rawdec: remove ff_raw_read_header
pcmdec: remove dependency from rawdec
g722: refactor out of rawdec.c
rawvideo: use a specific read_header
Conflicts:
ffmpeg.c
libavformat/Makefile
libavformat/rawdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-26 14:24:57 +02:00
Clément Bœsch
13d26716fb
lavfi/showspectrum: add sliding mode.
2012-10-25 22:20:22 +02:00
Nicolas George
48ec8b25a7
lavfi/af_volumedetect: print stats in uninit().
...
If the stats are printed when request_frame on the input
returns EOF, then they are never printed if the filter is
not flushed, in particular when using the -t ffmpeg option.
Fix trac ticket #1727 .
2012-10-25 20:16:09 +02:00
Nicolas George
77a72d3485
lavfi/vf_fps: allow to set the rounding method.
...
By default, fps selects frames near PTS 0, 0.5, 1.5, 2.5, etc.
With round=down, it selects the frames near PTS 0, 1, 2, 3, etc.
2012-10-25 19:42:44 +02:00
Janne Grunau
285b706b55
avfilter: fix graphparser memleaks on error paths
...
Fixes CID700635, CID700636 and CID732274.
2012-10-25 15:00:15 +02:00
Michael Niedermayer
95d07f33dc
libavfilter: include needed header for AVDictionary
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-24 22:24:54 +02:00
Stefano Sabatini
8b03cd3cd7
lavd/lavfi: add graph_file option
...
Allow to specify a filename where to put the filtergraph description.
This is useful to override limitations or glitches of particular shell
environments, and allows a level of indirection for specifying
filtergraphs.
2012-10-23 22:08:55 +02:00
Stefano Sabatini
bd6240e7e9
lavfi/sendcmd: move buf init() variable to internal scope where it is used
2012-10-23 22:08:55 +02:00
Stefano Sabatini
c7065f1f89
lavfi/sendcmd: release file in case of failed allocation
...
Avoid hanging file.
2012-10-23 22:08:55 +02:00
Michael Niedermayer
6182e0a6f6
vf_aspect: unbreak avoption system
...
This fixes ff* -h infinite looping
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-22 13:12:15 +02:00
Stefano Sabatini
6752aac6bc
lavfi/aspect: add max option
2012-10-22 10:46:43 +02:00
Stefano Sabatini
ccd6def9b3
lavfi/aspect: extend syntax for the setdar and setsar filters
...
Add support for named options, and deprecate old "num:den" ambiguous
syntax.
2012-10-22 10:46:34 +02:00
Michael Niedermayer
39747d87d0
avfilter_graph_parse: add support for parsing sws_flags
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-22 00:07:35 +02:00
Stefano Sabatini
8f37a1e8dc
lavfi/avfiltergraph: avoid to print "(null)" in the scale args
...
Fix parsing.
2012-10-21 21:44:53 +02:00
Stefano Sabatini
2969abd908
lavfi/graphparser: fix parsing error in case of NULL sws_opts addition
...
If sws_opts was NULL it was resulting in the args being set to
"W:H:(null)", which with the new parsing code was generating a syntax
failure.
2012-10-21 21:44:45 +02:00
Clément Bœsch
fbedce6b85
lavfi/silencedetect: export silence info to metadata.
2012-10-21 17:29:11 +02:00
Clément Bœsch
de23953de2
lavfi/select: store scene score in buf ref metadata.
2012-10-21 17:29:11 +02:00
Clément Bœsch
6fb2fd895e
lavc: add lavfi metadata support.
...
This commit introduces a new AVPacket side data type:
AV_PKT_DATA_STRINGS_METADATA. Its main goal is to provide a way to
transmit the metadata from the AVFilterBufferRef up to the AVFrame. This
is at the moment "only" useful for lavfi input from libavdevice:
lavd/lavfi only outputs packets, and the metadata from the buffer ref
kept in its context needs to be transmitted from the packet to the frame
by the decoders. The buffer ref can be destroyed at any time (along with
the metadata), and a duplication of the AVPacket needs to duplicate the
metadata as well, so the choice of using the side data to store them was
selected.
Making sure lavd/lavfi raises the metadata is useful to allow tools like
ffprobe to access the filters metadata (it is at the moment the only
way); ffprobe will now automatically show the AVFrame metadata in any
customizable output format for users. API users will also be able to
access the AVFrame->metadata pointer the same way ffprobe does
(av_frame_get_metadata).
All the changes are done in this single commit to avoid some memory
leaks: for instances, the changes in lavfi/avcodec.c are meant to
duplicate the metadata from the buffer ref into the AVFrame. Unless we
have an internal way of freeing the AVFrame->metadata automatically, it
will leak in most of the user apps. To fix this problem, we introduce
AVCodecContext->metadata and link avctx->metadata to the current
frame->metadata and free it at each decode frame call (and in the codec
closing callback for the last one). But doing this also means to update
the way the tiff decoder already handles the AVFrame->metadata (it's the
only one decoder with frame metadata at the moment), by making sure it
is not trying to free a pointer already freed by the lavc internals.
The lavfi/avcodec.c buffer ref code is based on an old Thomas Kühnel
work, the rest of the code belongs to the commit author.
Signed-off-by: Thomas Kühnel <kuehnelth@googlemail.com>
Signed-off-by: Clément Bœsch <ubitux@gmail.com>
2012-10-21 17:29:10 +02:00
Clément Bœsch
273fca9ac0
lavfi/silencedetect: increase duration precision.
...
This should also fix CID717889.
2012-10-21 01:28:19 +02:00
Hendrik Leppkes
79393a8363
Replace usage of the deprecated av_pix_fmt_descriptors array with av_pix_fmt_desc_get
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-20 18:00:13 +02:00
Michael Niedermayer
aaf78e4d14
vf_mp: fix null ptr deref in case of ENOMEM
...
Fixes CID703675
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-19 19:59:38 +02:00
Michael Niedermayer
042a738b45
vf_mp: check list in querry_format()
...
Fixes CID717772
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-19 19:59:38 +02:00
Michael Niedermayer
31fdf3065d
vf_idet: reorder operations to avoid division by 0
...
Fixes CID733738
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-19 19:59:32 +02:00
Nicolas George
709628aa71
lavfi/avf_concat: fix invalid exclusive test.
...
The invalid test did not cause any actual problem since
the first branch is only possible with bogus filters.
Fix coverity issue CID 733850.
2012-10-17 21:28:58 +02:00
Michael Niedermayer
657998b5ee
libavfilter/lavfutils: remove useless NULL check on format context
...
Fixes: CID733804
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-17 20:00:31 +02:00
Michael Niedermayer
fd9e88fe60
libavfilter/lavfutils: remove useless NULL check on codec context
...
The code would crash before if it was NULL
Fixes CID733804
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-17 20:00:20 +02:00
Michael Niedermayer
5d2b885074
lavfi: limit matching w/h/fmt asserts to non scale filters
...
This fixes a regression with the scale filters input changing.
In the long run filters should get a flag to indicate support of this
and then this flag be used here.
But the regression should not be left standing until thats done.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-17 00:06:12 +02:00
Michael Niedermayer
6cbb8a450f
libavfilter/buffersrc: Do not fail hard on changes of input parameters.
...
Several filters support this already.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-17 00:06:12 +02:00
Michael Niedermayer
4cc4ca5847
mandelbrot: fix inner=period coloring routine
...
Fixes CID717571
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-16 04:00:55 +02:00
Stefano Sabatini
faa1cb50ed
lavfi/ass: extend syntax for ass filter
...
Make the filter accept named options for the first argument, and update
documentation accordingly.
2012-10-15 22:40:08 +02:00
Michael Niedermayer
d6f6a7557c
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
avutil: Do not make ff_ symbols globally visible.
avutil: Rename ff_set_systematic_pal2() ---> avpriv_set_systematic_pal2()
build: tms470: work around glibc math.h problems
configure: improve tms470 compiler usage with glibc
Conflicts:
libavcodec/bmpenc.c
libavcodec/rawdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-14 15:11:34 +02:00
Clément Bœsch
096d96ffda
lavfi/select/scene: use pointer increments instead of y*linesize.
2012-10-14 02:09:05 +02:00
Clément Bœsch
0852648301
lavfi/select/scene: fix potential overread.
...
Also make sure we use the actual width of the image and not the whole
linesize.
2012-10-14 02:08:06 +02:00
Clément Bœsch
dff826b4a8
lavfi/select/scene: move out convoluted sad variable init from loop.
2012-10-14 01:23:00 +02:00
Michael Niedermayer
3b0bb321a5
Merge commit 'f6c38c5f4ed6683a6a61db2ed418a68bbe5f5507'
...
* commit 'f6c38c5f4ed6683a6a61db2ed418a68bbe5f5507':
avfilter: call x86 init functions under if (ARCH_X86), not if (HAVE_MMX)
rtspdec: Set the default port for listen mode, if none is specified
tscc2: Fix an out of array access
rtmpproto: Fix an out of array write
rtspdec: Fix use of uninitialized byte
vp8: reset loopfilter delta values at keyframes.
avutil: add yuva422p and yuva444p formats
Conflicts:
libavutil/pixdesc.c
libavutil/pixfmt.h
tests/ref/lavfi/pixdesc
tests/ref/lavfi/pixfmts_copy
tests/ref/lavfi/pixfmts_null
tests/ref/lavfi/pixfmts_scale
tests/ref/lavfi/pixfmts_vflip
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-13 14:14:11 +02:00
Michael Niedermayer
d2a618ab22
af_pan: fix memleak of arg
...
Fixes CID718988
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-13 01:51:45 +02:00
Michael Niedermayer
f374e9989b
vf_fade: fix memleaks of args
...
Fixes: CID718989
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-13 01:08:08 +02:00
Diego Biurrun
f6c38c5f4e
avfilter: call x86 init functions under if (ARCH_X86), not if (HAVE_MMX)
2012-10-12 19:58:51 +02:00
Michael Niedermayer
13afee951a
Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627'
...
* commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627':
lavfi: do not use av_pix_fmt_descriptors directly.
Conflicts:
libavfilter/buffersrc.c
libavfilter/drawutils.c
libavfilter/filtfmts.c
libavfilter/vf_ass.c
libavfilter/vf_boxblur.c
libavfilter/vf_drawtext.c
libavfilter/vf_lut.c
libavfilter/vf_pad.c
libavfilter/vf_scale.c
libavfilter/vf_showinfo.c
libavfilter/vf_transpose.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-12 17:04:58 +02:00
Anton Khirnov
59ee9f78b0
lavfi: do not use av_pix_fmt_descriptors directly.
2012-10-12 12:45:39 +02:00
Clément Bœsch
9ad1ea13e0
lavfi/ebur128: fix typo in condition.
...
Fixes CID733727.
2012-10-11 18:41:07 +02:00
Michael Niedermayer
9ba2484ece
af_aresample: fix leak on alloc failure
...
Fixes CID733798
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-11 16:48:25 +02:00
Michael Niedermayer
7457da3698
drawtext: fix leak with timecodes
...
Fixes CID733799
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-11 16:45:50 +02:00
Michael Niedermayer
526cb36e4b
Merge commit '4436f25a1682ada3f7226cb6fadf429946933161'
...
* commit '4436f25a1682ada3f7226cb6fadf429946933161':
build: remove references to unused EXTRAOBJS variable
lavfi: convert input/ouput list compound literals to named objects
fate: add h263 obmc vsynth tests
avconv: remove bogus warning when using avconv -h without parameter
averror: explicitly define AVERROR_* values
flashsv: propagate inflateReset() errors
indeo4/5: remove constant parameter num_bands from wavelet recomposition
mxfdec: return error if no segments are available in mxf_get_sorted_table_segments
Double motion vector range for HPEL interlaced picture in proper place
Conflicts:
libavcodec/v210dec.h
libavfilter/af_aformat.c
libavfilter/af_amix.c
libavfilter/af_asyncts.c
libavfilter/af_channelmap.c
libavfilter/af_join.c
libavfilter/asrc_anullsrc.c
libavfilter/buffersrc.c
libavfilter/f_setpts.c
libavfilter/f_settb.c
libavfilter/fifo.c
libavfilter/src_movie.c
libavfilter/vf_ass.c
libavfilter/vf_blackframe.c
libavfilter/vf_boxblur.c
libavfilter/vf_delogo.c
libavfilter/vf_drawbox.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c
libavfilter/vf_fieldorder.c
libavfilter/vf_fps.c
libavfilter/vf_hflip.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c
libavfilter/vf_select.c
libavfilter/vf_transpose.c
libavfilter/vf_yadif.c
libavfilter/vsrc_testsrc.c
libavformat/mxfdec.c
libavutil/error.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-11 15:46:48 +02:00
Michael Niedermayer
bdcff5af7f
af_volumedetect: fix use of uninitilaized variable in case of planar audio.
...
Fixes: CID733841
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-11 03:12:40 +02:00
Michael Niedermayer
989c91b504
asrc_aevalsrc: Fix use of uninitialized pointer inside av_strtok()
...
Fixes CID733842
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-11 03:00:34 +02:00
Michael Niedermayer
4d4f431ab7
vf_idet: zero pointers after freeing references
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-11 02:21:28 +02:00
Michael Niedermayer
cac749a551
vf_idet: fix free after use
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-11 02:21:28 +02:00
Mans Rullgard
568c70e79e
lavfi: convert input/ouput list compound literals to named objects
...
A number of compilers, for example those from TI and IBM, choke on
these initialisers. The current style is also quite ugly.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-10-10 22:26:12 +01:00
Matthieu Bouron
f94edfe484
vf_idet: remove some unnecessary statement and unused variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-10 16:48:58 +02:00
Michael Niedermayer
cd6f5c4895
Merge commit '6d0beefbf6ee6dbf8efb522a9307e54c6ed5f702'
...
* commit '6d0beefbf6ee6dbf8efb522a9307e54c6ed5f702':
swscale: Do not make ff_ symbols globally visible.
rtspdec: use av_strlcpy for writing into fixed size buffer
g722enc: fix size argument in memset
http: use av_strlcpy instead of strcpy() without size checks
avfilter: correct memcpy size avfilter_copy_buf_props()
lavc: split asv12 encoder/decoder
Conflicts:
libavcodec/asvdec.c
libavfilter/buffer.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-10 14:07:05 +02:00
Michael Niedermayer
50b5477616
Merge commit 'b94e4acb4874843e914fd3cb8e089aff0756bb4a'
...
* commit 'b94e4acb4874843e914fd3cb8e089aff0756bb4a':
cmdutils_read_file: increment *size after writing the trailing \0
af_resample: unref out_buf when avresample_convert returns 0
af_amix: prevent memory leak on error path
vc1dec: prevent memory leak in error path
vc1dec: prevent memory leak on av_realloc error
af_channelmap: free old extended_data on reallocation
avconv: simplify memory allocation in copy_chapters
matroskaenc: check cue point validity before reallocation
swfenc: error out for more than 1 audio or video stream
build: link test programs only against static libs
Conflicts:
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-10 13:18:05 +02:00
Clément Bœsch
6ac5e3fe9d
lavfi/silencedetect: add av_opt_free() call.
...
This avoids a memleak with noise_str.
2012-10-09 22:37:29 +02:00
Janne Grunau
79e6e8eba2
avfilter: correct memcpy size avfilter_copy_buf_props()
...
Does not make a difference in this case since sizeof(uint8_t*) ==
sizeof(uint8_t**). Fixes CID703814.
2012-10-09 21:05:14 +02:00
Janne Grunau
ac9a89562a
af_resample: unref out_buf when avresample_convert returns 0
...
Fixes CID732273.
2012-10-09 18:43:30 +02:00
Janne Grunau
8501c09868
af_amix: prevent memory leak on error path
...
Fixes CID732272.
2012-10-09 16:15:15 +02:00
Janne Grunau
1afd7a118f
af_channelmap: free old extended_data on reallocation
...
Prevents writes to freed memory and the leak of the old extended data.
Fixes CID732303.
2012-10-09 15:41:24 +02:00
Michael Niedermayer
ac627b3d38
Merge commit '716d413c13981da15323c7a3821860536eefdbbb'
...
* commit '716d413c13981da15323c7a3821860536eefdbbb':
Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat
Conflicts:
doc/examples/muxing.c
ffmpeg.h
ffmpeg_filter.c
ffmpeg_opt.c
ffplay.c
ffprobe.c
libavcodec/8bps.c
libavcodec/aasc.c
libavcodec/aura.c
libavcodec/avcodec.h
libavcodec/avs.c
libavcodec/bfi.c
libavcodec/bmp.c
libavcodec/bmpenc.c
libavcodec/c93.c
libavcodec/cscd.c
libavcodec/cyuv.c
libavcodec/dpx.c
libavcodec/dpxenc.c
libavcodec/eatgv.c
libavcodec/escape124.c
libavcodec/ffv1.c
libavcodec/flashsv.c
libavcodec/fraps.c
libavcodec/h264.c
libavcodec/huffyuv.c
libavcodec/iff.c
libavcodec/imgconvert.c
libavcodec/indeo3.c
libavcodec/kmvc.c
libavcodec/libopenjpegdec.c
libavcodec/libopenjpegenc.c
libavcodec/libx264.c
libavcodec/ljpegenc.c
libavcodec/mjpegdec.c
libavcodec/mjpegenc.c
libavcodec/motionpixels.c
libavcodec/mpeg12.c
libavcodec/mpeg12enc.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo_enc.c
libavcodec/pamenc.c
libavcodec/pcxenc.c
libavcodec/pgssubdec.c
libavcodec/pngdec.c
libavcodec/pngenc.c
libavcodec/pnm.c
libavcodec/pnmdec.c
libavcodec/pnmenc.c
libavcodec/ptx.c
libavcodec/qdrw.c
libavcodec/qpeg.c
libavcodec/qtrleenc.c
libavcodec/raw.c
libavcodec/rawdec.c
libavcodec/rl2.c
libavcodec/sgidec.c
libavcodec/sgienc.c
libavcodec/snowdec.c
libavcodec/snowenc.c
libavcodec/sunrast.c
libavcodec/targa.c
libavcodec/targaenc.c
libavcodec/tiff.c
libavcodec/tiffenc.c
libavcodec/tmv.c
libavcodec/truemotion2.c
libavcodec/utils.c
libavcodec/vb.c
libavcodec/vp3.c
libavcodec/wnv1.c
libavcodec/xl.c
libavcodec/xwddec.c
libavcodec/xwdenc.c
libavcodec/yop.c
libavdevice/v4l2.c
libavdevice/x11grab.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/buffersrc.c
libavfilter/drawutils.c
libavfilter/formats.c
libavfilter/src_movie.c
libavfilter/vf_ass.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c
libavfilter/vf_format.c
libavfilter/vf_hflip.c
libavfilter/vf_lut.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c
libavfilter/vf_scale.c
libavfilter/vf_transpose.c
libavfilter/vf_yadif.c
libavfilter/video.c
libavfilter/vsrc_testsrc.c
libavformat/movenc.c
libavformat/mxf.h
libavformat/utils.c
libavformat/yuv4mpeg.c
libavutil/imgutils.c
libavutil/pixdesc.c
libswscale/input.c
libswscale/output.c
libswscale/swscale_internal.h
libswscale/swscale_unscaled.c
libswscale/utils.c
libswscale/x86/swscale_template.c
libswscale/x86/yuv2rgb.c
libswscale/x86/yuv2rgb_template.c
libswscale/yuv2rgb.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-08 21:06:57 +02:00
Michael Niedermayer
43c157f4a4
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
af_resample: avoid conversion of identical sample formats for 1 channel
avcodec: allow either planar or interleaved sample format when encoding mono
adpcmenc: ensure calls to adpcm_ima_compress_sample() are in the right order
timefilter: De-doxygenize normal code comments and drop silly ones
gxf: Include the right header for the avpriv_frame_rate_tab declaration
Conflicts:
libavcodec/adpcmenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-08 13:11:11 +02:00
Anton Khirnov
716d413c13
Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat
2012-10-08 07:13:26 +02:00
Justin Ruggles
7b556be673
af_resample: avoid conversion of identical sample formats for 1 channel
...
When there is only 1 channel, the planar and interleaved formats of the same
data type should be treated as identical.
2012-10-07 16:45:50 -04:00
Bobby Bingham
51211d351c
vf_tile: fix typos/grammar in comments
...
Signed-off-by: Bobby Bingham <uhmmmm@gmail.com>
2012-10-06 11:34:10 -05:00
Michael Niedermayer
55c49afc42
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
yuv4mpeg: return proper error codes.
Give all anonymously typedeffed structs in headers a name
fate: Add parseutils test
parseutils-test: Drop random colors from parsing test
vf_pad/scale: use double precision for aspect ratios.
build: error on variable-length arrays
ppc: swscale: rework yuv2planeX_altivec()
ppc: fmtconvert: kill VLA in float_to_int16_interleave_altivec()
x86: dsputil: kill VLA in gmc_mmx()
libspeexenc: Updated commentary to reflect recent changes
libspeexenc: Add an option for enabling DTX
doc/APIchanges: fill in missing dates and hashes.
lavr: bump major to 1 and declare it stable.
lavr: change the type of the data buffers to uint8_t**.
lavc: deprecate the audio resampling API.
Conflicts:
cmdutils.h
configure
doc/APIchanges
ffplay.c
libavcodec/dwt.h
libavcodec/libspeexenc.c
libavfilter/vf_pad.c
libavfilter/vf_scale.c
libavformat/asf.h
tests/fate/libavutil.mak
tests/ref/fate/parseutils
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-06 13:45:08 +02:00
Diego Biurrun
e4cbf7529b
Give all anonymously typedeffed structs in headers a name
...
Anonymous structs cannot be forward declared and have no benefit.
2012-10-06 09:27:11 +02:00
Anton Khirnov
ba04177eeb
vf_pad/scale: use double precision for aspect ratios.
...
Fixes Bug 203.
CC:libav-stable@libav.org
2012-10-06 07:27:53 +02:00
Carl Eugen Hoyos
eb63a74789
Do not print debug output for the (MPlayer) pullup filter.
2012-10-05 21:03:59 +02:00
Anton Khirnov
e7ba5b1de0
lavr: change the type of the data buffers to uint8_t**.
...
This is more consistent with what the rest of Libav does.
This breaks API.
2012-10-05 13:49:44 +02:00
Michael Niedermayer
0f1446a4d0
Merge commit 'ab35ec29a4071871934856c00da7d6ebcc0c095b'
...
* commit 'ab35ec29a4071871934856c00da7d6ebcc0c095b':
vf_overlay: get rid of pointless messing with timebase.
samplefmt: make av_samples_alloc() initialize the data to silence.
libspeexdec: handle NULL return value from speex_packet_to_header()
h264probe: Don't error out on bits that no longer are reserved
mpegvideo: set extended_data in ff_update_duplicate_context()
libspeexdec: properly handle DTX for multiple frames-per-packet
libspeexdec: move the SpeexHeader from LibSpeexContext to where it is used
libspeexdec: simplify setting of frame_size
libspeexdec: set channel_layout
Conflicts:
libavfilter/vf_overlay.c
libavformat/h264dec.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-04 13:11:45 +02:00
Anton Khirnov
4673a5a761
vf_overlay: properly sync inputs.
...
Right now it incorrectly assumes that the frames are sent in the proper
order, which worked with old ffmpeg and avconv versions by accident.
2012-10-04 10:23:25 +02:00
Anton Khirnov
ab35ec29a4
vf_overlay: get rid of pointless messing with timebase.
...
Output frames correspond 1:1 to input frames on the main input.
So use the main input timebase for output.
2012-10-04 10:21:58 +02:00
Stefano Sabatini
c053f48662
lavfi/transpose: add passthrough option
2012-10-02 09:43:06 +02:00
Stefano Sabatini
6300062774
lavfi/transpose: add support to named options and shortands
...
Allow extensibility.
2012-10-02 09:20:10 +02:00
Clément Bœsch
2308c5bb25
lavfi/edgedetect: add missing minus in a comment.
2012-10-01 22:31:14 +02:00
Clément Bœsch
d771b1d137
lavfi: EBU R.128 scanner.
2012-10-01 22:26:19 +02:00
Clément Bœsch
13d878366f
lavfi/ashowinfo: check plane value before deferencing.
2012-09-30 21:00:52 +02:00
jamal
a70b4935f1
Add missing version macros to libraries
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-28 15:10:18 +02:00
Nicolas George
9de731e9d0
lavfi/sink_buffer: implement libav compatibility API.
...
Implement av_buffersink_read() and av_buffersink_read_samples()
for ffmpeg's version of buffersink.
With this change, avconv linked against ffmpeg's libraries passes
the same number of tests whether it uses ffbuffersink or
buffersink_old.
2012-09-27 18:43:37 +02:00
Nicolas George
8e1f063efc
lavfi: enable buffersinks unconditionally.
...
They are part of the public API. Their libav compatibility
counterpart are already enabled unconditionally.
2012-09-27 15:57:30 +02:00
Michael Niedermayer
46a35959d8
Merge commit '7751e4693dd10ec98c20fbd9887233b575034272'
...
* commit '7751e4693dd10ec98c20fbd9887233b575034272':
ogg: check that the expected number of headers had been parsed
libx264: change default to closed gop to match x264cli
Use avcodec_free_frame() to free AVFrames.
lavf: use a malloced AVFrame in try_decode_frame().
lavc: add avcodec_free_frame().
lavc: ensure extended_data is set properly on decoding
lavc: initialize AVFrame.extended_data in avcodec_get_frame_defaults()
lavc: use av_mallocz to allocate AVFrames.
lavc: rename the argument of avcodec_alloc_frame/get_frame_defaults
Conflicts:
doc/APIchanges
doc/examples/decoding_encoding.c
libavcodec/utils.c
libavcodec/version.h
libavfilter/src_movie.c
libavformat/oggdec.c
libavformat/oggdec.h
libavformat/oggparsetheora.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-25 15:15:16 +02:00
Anton Khirnov
11d1ca4b2c
Use avcodec_free_frame() to free AVFrames.
2012-09-24 12:31:25 +02:00
Stefano Sabatini
740c995288
lavfi: add asendcmd and sendcmd filters
2012-09-23 00:50:06 +02:00
Stefano Sabatini
7fe1ecefe1
lavfi/hue: simplify/fix setting logic in set_options()
...
Parse expression only when a new value is explicitly specified.
In particular, avoid double free in case an old expression value is
cached, it is set in the context, it is freed as the old value, and
finally the pointer stored in the context is freed again when the filter
is released.
2012-09-23 00:46:33 +02:00
Andrew Wason
225efccefc
lavfi/buffersink: fix check on pixel_fmts in the opaque parameter
...
Fix programmatic selection of accepted pixel formats.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2012-09-22 10:59:40 +02:00
Loren Merritt
1b1b902e2c
hqdn3d: Fix out of array read in LOWPASS
...
Fixes ticket1752
Commit message by commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-22 03:17:28 +02:00
Stefano Sabatini
3aa1b53256
lavfi/hue: set to NULL freed pointers
...
Possibly safer.
2012-09-21 12:44:44 +02:00
Stefano Sabatini
31aa5b1a78
lavfi/hue: fix crash when resetting the saturation expression
...
Previously when saturation was reinited, the old value was freed when
setting options, and freed again in PARSE_EXPRESSION().
2012-09-21 12:43:52 +02:00
Michael Niedermayer
3dc24600ba
vsrc_testsrc: Fix case without a specified duration
...
Fixes regression since 98f753ec51
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-21 03:00:15 +02:00
Clément Bœsch
2f39d7ff3f
lavfi/select: make lavc dependency optional.
2012-09-20 18:45:47 +02:00
Stefano Sabatini
98f753ec51
lavfi/testsrc: increase precision of the duration parameter
...
Compute duration in microseconds, rather than in timebase units. Decrease
approximation errors.
2012-09-20 12:13:17 +02:00
Michael Niedermayer
c1f3a4d1e3
libavfilter/filtfmts: fix argv/argc checks
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-19 22:43:03 +02:00
Michael Niedermayer
f5326dc68e
bavfilter/filtfmts: fix type for channel layouts
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-19 22:19:06 +02:00
Clément Bœsch
b89c16e73e
lavfi/select: make sure avctx is set before closing it.
...
This avoid a crash when the filter fails before config_input(),
typically with a syntax error in the next filter:
select=gt(scene\,.4),select=fail
2012-09-18 18:52:57 +02:00
Michael Niedermayer
91af76099e
Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521'
...
* commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521':
alsdec: Check k used for rice decoder.
avfiltergraph: silence an uninitialized variable warning
xsubenc: reindent
lavc: replace AVCodecContext.encode with subtitle-specific callback
lavc: add const to private codec class initialization.
avconv: don't pass a bogus parameter to avfilter_graph_create_filter().
id3v2: strdup the genre name explicitly.
lavf/id3v2: do not export empty fields.
buffersrc: add const to the AVFrame* argument of av_buffersrc_write_frame()
lavfi: replace empty input/output lists with null pointers
Conflicts:
ffmpeg_filter.c
libavcodec/alsdec.c
libavcodec/dvdsubenc.c
libavcodec/utils.c
libavcodec/v210dec.h
libavfilter/af_channelsplit.c
libavfilter/avfiltergraph.c
libavfilter/buffersrc.c
libavfilter/src_movie.c
libavfilter/vf_ass.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-18 14:45:44 +02:00
Anton Khirnov
e3496e5dbe
avfiltergraph: silence an uninitialized variable warning
...
The warning is:
libavfilter/avfiltergraph.c: In function ‘avfilter_graph_config’:
libavfilter/avfiltergraph.c:528:9: warning: ‘best_idx’ may be used uninitialized in this function [-Wuninitialized]
libavfilter/avfiltergraph.c:479:13: note: ‘best_idx’ was declared here
Initialize it to an invalid value and add an assert that it's properly
set later.
2012-09-17 15:48:20 +02:00
Anton Khirnov
4e48aa8656
buffersrc: add const to the AVFrame* argument of av_buffersrc_write_frame()
2012-09-17 15:48:20 +02:00
Mans Rullgard
1fce361d70
lavfi: replace empty input/output lists with null pointers
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-09-17 14:35:06 +01:00
Clément Bœsch
74434d3bfe
lavfi/ass: mark ass_libavfilter_log_level_map as static const.
2012-09-16 02:59:43 +02:00
Hendrik Leppkes
e3a1eb9edf
af_pan: Fix sscanf formats to work with buggy sscanf implementations
...
Some implementations of sscanf do not handle a space before a trailing %n
properly.
As an example, MSVC's does this for the second insatnce in this patch, for
an input of "0x3:c0=c1:c1=c0":
1) Match the final "c0" or "c1".
2) Realize it's at the end of the string.
3) Check for %n.
4) There is no %n, but a space instead.
5) Leave 'len' unitilialized.
So, move it out of the sscanf format strings, and call skip_spaces instead.
This bug does not affect skip_spaces since %n is the first and only formatting
string.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2012-09-15 19:49:34 -04:00
Jérémy Tran
75d34864d1
lavfi/hue: add dynamic expression evaluation support
...
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2012-09-15 01:05:27 +02:00
Stefano Sabatini
dead4580e2
lavfi/avcodec: apply cosmetics style fixes
2012-09-14 11:06:40 +02:00
Nicolas George
8ad54a44eb
lavfi: check that buffer and link properties match.
2012-09-13 20:09:53 +02:00
Nicolas George
c262ddb8c5
lavfi: set sample_rate in the default allocator.
2012-09-13 20:09:53 +02:00
Nicolas George
b5bea2f960
lavfi/aresample: set buffer properties after copy.
...
The aresample filter changes the format, layout and/or sample rate,
it can not copy them blindly from its input.
Related to trac ticket #1671 .
2012-09-13 12:05:19 +02:00
Stefano Sabatini
3015194448
lavfi/amerge: clarify the error message in case of input overlap
2012-09-11 18:58:19 +02:00
Clément Bœsch
bbae8cdf4d
lavfi/amerge: avoid a forward declaration.
2012-09-11 18:38:09 +02:00
Clément Bœsch
7b56dddd56
lavfi/amerge: fix input pad name behaviour.
...
This fixes two problems:
- the invalid pad.name stack pointer after init() ends
- the duplicated name for all inputs
2012-09-11 14:59:23 +02:00
Stefano Sabatini
206c34e17d
lavfi/setpts: set SAMPLE_RATE to NAN when input is no audio
...
Should be more robust/consistent.
2012-09-10 18:52:28 +02:00
Stefano Sabatini
722762f7e1
lavfi/setpts: add FRAME_RATE constant
...
Useful for dealing with constant frame-rate video.
2012-09-10 18:52:28 +02:00
Michael Niedermayer
bff2afb3e9
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
x86: dsputil: Only compile motion_est code when encoders are enabled
mem: fix typo in check for __ICC
fate: mp3: drop redundant CMP setting
rtp: Depacketization of JPEG (RFC 2435)
Rename ff_put_string to avpriv_put_string
mjpeg: Rename some symbols to avpriv_* instead of ff_*
yadif: cosmetics
Conflicts:
Changelog
libavcodec/mjpegenc.c
libavcodec/x86/Makefile
libavfilter/vf_yadif.c
libavformat/version.h
libavutil/mem.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-10 14:06:20 +02:00
Luca Barbato
28165fee1b
yadif: cosmetics
2012-09-09 15:31:18 +02:00
Stefano Sabatini
a4cb0af945
lavfi: drop deprecated and pointless avfilter_default_end_frame() function
...
Fix warning when compiling boxblur.
While this is technically a major API break, practically there will be no
one using that function since the filtering API is mostly private, so
that function alone is not usable.
2012-09-09 10:57:28 +02:00
Derek Buitenhuis
3fe303a27d
vf_idet: Remove emms
...
There is no MMX code anyway.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-07 20:08:12 +02:00
Derek Buitenhuis
a2015b41a0
vf_colormatrix: Drop unused strings.h header
...
It already uses av_strcasecmp.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-07 18:24:43 +02:00
Michael Niedermayer
fa85118510
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
mov_chan: Pass a separate AVIOContext for reading
af_asyncts: check return value from lavr when flushing.
mss2: simplify loop in decode_rle()
mss12: avoid unnecessary division in arith*_get_bit()
mss2: do not try to read too many palette entries
mpegvideo: set AVFrame fields to NULL after freeing the base memory
configure: Set the right cc_e flags for msvc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-07 13:50:24 +02:00
Michael Niedermayer
91141f2a13
lavfi: add qp_table_size
...
This avoid recalculating it and in case w/h changed avoids crashes.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-07 13:00:47 +02:00
Anton Khirnov
91a84a5247
af_asyncts: check return value from lavr when flushing.
...
Fixes an infinite loop on flush when avresample_get_delay() still
reports some samples but avresample_convert() doesn't return any data.
2012-09-07 09:06:48 +02:00
Michael Niedermayer
ca7be934d6
lavfi: 10l fix () placement
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-07 06:53:11 +02:00
Michael Niedermayer
a33b4bc79c
lavfi: factor copy_video_props() out
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-07 05:24:48 +02:00
Michael Niedermayer
c9a0f9bf3c
libavfilter: pass QP table through the filter chain
...
Any volunteers to port the pp and spp filters from libmpcodec?
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-07 03:17:28 +02:00
Stefano Sabatini
fb2e7ac3c4
lavfi/mp: drop rotate wrapper
...
The native filter transpose is perfectly equivalent.
2012-09-06 11:27:22 +02:00
Stefano Sabatini
9a2daef53f
lavfi/tinterlace: declare source buffers in copy_picture_field() as const
...
Increase performance (slightly).
2012-09-06 00:40:01 +02:00
Stefano Sabatini
fd5293d216
lavfi/tinterlace: set inlink->cur to NULL, since it is stored internally
...
If not set to NULL, the reference is freed by ff_end_frame(), and later
accessed in end_frame() by the filter code, causing a crash.
2012-09-06 00:40:01 +02:00
Michael Niedermayer
e60fcdb989
vf_hue: fix AVOption defaults
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-05 22:18:53 +02:00
Michael Niedermayer
8267f0f7ae
vf_scale: fix incompatible pointer type warning
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-05 18:31:18 +02:00
Michael Niedermayer
8510150f48
Merge commit '21bc44038491e525335ad763883b0288402ff6a0'
...
* commit '21bc44038491e525335ad763883b0288402ff6a0':
avopt: Explicitly store rational option defaults in .dbl
Conflicts:
libavfilter/buffersrc.c
libavfilter/vsrc_testsrc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-05 14:52:52 +02:00