diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-06 23:31:08 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-06 23:53:19 +0400 |
| commit | 715c8a5a5052d67423f27192444474a3d61dce60 (patch) | |
| tree | 4d96bf6fdbbbebef82f0263d2fde088cd4ee9a09 /libavfilter/allfilters.c | |
| parent | cbbc4724672ec5839427f9b4129051fac9de390b (diff) | |
| parent | fb5c1aaea60a714dab3d4e6e71228855fd816222 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (28 commits)
dfa: use more meaningful return codes
eatgv: check vector_bits
eatgv: check motion vectors
Mark a number of variables only used in av_dlog() calls as av_unused.
dvdec: drop const qualifier from variable to eliminate a warning
avcodec: Improve comment for thread_safe_callbacks to avoid misinterpretation.
tests/utils: don't ignore the return value of fwrite()
lavfi/formats: use sizeof(var) instead of sizeof(type).
lavfi: remove avfilter_default_config_input_link() declaration
lavfi: always enable the scale filter and depend on sws.
vf_split: support user-specifiable number of outputs.
avconv: remove stray useless comment.
mpegmux: add stuffing to avoid incomplete PCM frames
rtsp: avoid const warnings from strtol() call
avserver: check return value of ftruncate()
lagarith: make offset array type unsigned
dfa: add some checks to ensure that decoder won't write past frame end
aacps: NEON optimisations
aacps: align some arrays
aacps: move some loops to function pointers
...
Conflicts:
configure
doc/filters.texi
libavcodec/dfa.c
libavcodec/eatgv.c
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/avfilter.h
libavfilter/formats.c
libavfilter/vf_split.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/allfilters.c')
| -rw-r--r-- | libavfilter/allfilters.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 5241fc09ad..96de563606 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -89,7 +89,6 @@ void avfilter_register_all(void) REGISTER_FILTER (PAD, pad, vf); REGISTER_FILTER (PIXDESCTEST, pixdesctest, vf); REGISTER_FILTER (REMOVELOGO, removelogo, vf); - REGISTER_FILTER (SCALE, scale, vf); REGISTER_FILTER (SELECT, select, vf); REGISTER_FILTER (SETDAR, setdar, vf); REGISTER_FILTER (SETFIELD, setfield, vf); @@ -123,9 +122,14 @@ void avfilter_register_all(void) REGISTER_FILTER (BUFFERSINK, buffersink, vsink); REGISTER_FILTER (NULLSINK, nullsink, vsink); - /* vsrc_buffer is a part of public API => registered unconditionally */ + /* those filters are part of public or internal API => registered + * unconditionally */ { extern AVFilter avfilter_vsrc_buffer; avfilter_register(&avfilter_vsrc_buffer); } + { + extern AVFilter avfilter_vf_scale; + avfilter_register(&avfilter_vf_scale); + } } |