diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2012-07-23 23:21:33 +0200 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2012-07-28 10:50:11 +0200 |
| commit | 32390d6767e1f874a23277c36aaa5cbb5c720820 (patch) | |
| tree | 2721419f79725bae7a924bb94405c676288704a7 /libavfilter | |
| parent | 7cf9aaddcd8d226df48ab00cb709a5e65411d566 (diff) | |
| download | ffmpeg-streaming-32390d6767e1f874a23277c36aaa5cbb5c720820.zip ffmpeg-streaming-32390d6767e1f874a23277c36aaa5cbb5c720820.tar.gz | |
lavfi: move movie and amovie to a "multimedia sources" section
Since the recent changes, movie and amovie are able to deal with more
than one type of stream, so they should be categorized as "multimedia
sources" rather than audio/video sources.
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/Makefile | 6 | ||||
| -rw-r--r-- | libavfilter/allfilters.c | 6 | ||||
| -rw-r--r-- | libavfilter/src_movie.c | 4 |
3 files changed, 10 insertions, 6 deletions
diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 15ca959..d629948 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -69,7 +69,6 @@ OBJS-$(CONFIG_SILENCEDETECT_FILTER) += af_silencedetect.o OBJS-$(CONFIG_VOLUME_FILTER) += af_volume.o OBJS-$(CONFIG_AEVALSRC_FILTER) += asrc_aevalsrc.o -OBJS-$(CONFIG_AMOVIE_FILTER) += src_movie.o OBJS-$(CONFIG_ANULLSRC_FILTER) += asrc_anullsrc.o OBJS-$(CONFIG_ABUFFERSINK_FILTER) += sink_buffer.o @@ -137,7 +136,6 @@ OBJS-$(CONFIG_COLOR_FILTER) += vsrc_color.o OBJS-$(CONFIG_FREI0R_SRC_FILTER) += vf_frei0r.o OBJS-$(CONFIG_LIFE_FILTER) += vsrc_life.o OBJS-$(CONFIG_MANDELBROT_FILTER) += vsrc_mandelbrot.o -OBJS-$(CONFIG_MOVIE_FILTER) += src_movie.o OBJS-$(CONFIG_MPTESTSRC_FILTER) += vsrc_mptestsrc.o OBJS-$(CONFIG_NULLSRC_FILTER) += vsrc_testsrc.o OBJS-$(CONFIG_RGBTESTSRC_FILTER) += vsrc_testsrc.o @@ -202,5 +200,9 @@ OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/pullup.o OBJS-$(CONFIG_CONCAT_FILTER) += avf_concat.o OBJS-$(CONFIG_SHOWWAVES_FILTER) += avf_showwaves.o +# multimedia sources +OBJS-$(CONFIG_AMOVIE_FILTER) += src_movie.o +OBJS-$(CONFIG_MOVIE_FILTER) += src_movie.o + TOOLS = graph2dot TESTPROGS = drawutils filtfmts formats diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 58a3c14..d79218e 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -58,7 +58,6 @@ void avfilter_register_all(void) REGISTER_FILTER (RESAMPLE, resample, af); REGISTER_FILTER (AEVALSRC, aevalsrc, asrc); - REGISTER_FILTER (AMOVIE, amovie, asrc); REGISTER_FILTER (ANULLSRC, anullsrc, asrc); REGISTER_FILTER (ABUFFERSINK, abuffersink, asink); @@ -126,7 +125,6 @@ void avfilter_register_all(void) REGISTER_FILTER (FREI0R, frei0r_src, vsrc); REGISTER_FILTER (LIFE, life, vsrc); REGISTER_FILTER (MANDELBROT, mandelbrot, vsrc); - REGISTER_FILTER (MOVIE, movie, vsrc); REGISTER_FILTER (MPTESTSRC, mptestsrc, vsrc); REGISTER_FILTER (NULLSRC, nullsrc, vsrc); REGISTER_FILTER (RGBTESTSRC, rgbtestsrc, vsrc); @@ -139,6 +137,10 @@ void avfilter_register_all(void) REGISTER_FILTER (CONCAT, concat, avf); REGISTER_FILTER (SHOWWAVES, showwaves, avf); + /* multimedia sources */ + REGISTER_FILTER (AMOVIE, amovie, avsrc); + REGISTER_FILTER (MOVIE, movie, avsrc); + /* those filters are part of public or internal API => registered * unconditionally */ { diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c index d49287b..a4a1293 100644 --- a/libavfilter/src_movie.c +++ b/libavfilter/src_movie.c @@ -566,7 +566,7 @@ static int movie_request_frame(AVFilterLink *outlink) #if CONFIG_MOVIE_FILTER -AVFilter avfilter_vsrc_movie = { +AVFilter avfilter_avsrc_movie = { .name = "movie", .description = NULL_IF_CONFIG_SMALL("Read from a movie source."), .priv_size = sizeof(MovieContext), @@ -582,7 +582,7 @@ AVFilter avfilter_vsrc_movie = { #if CONFIG_AMOVIE_FILTER -AVFilter avfilter_asrc_amovie = { +AVFilter avfilter_avsrc_amovie = { .name = "amovie", .description = NULL_IF_CONFIG_SMALL("Read audio from a movie source."), .priv_size = sizeof(MovieContext), |
