Remove references to the "ff" variant of buffersink.
authorNicolas George <nicolas.george@normalesup.org>
Mon, 11 Mar 2013 20:49:04 +0000 (21:49 +0100)
committerNicolas George <nicolas.george@normalesup.org>
Tue, 12 Mar 2013 22:31:07 +0000 (23:31 +0100)
doc/examples/filtering_audio.c
doc/examples/filtering_video.c
ffmpeg_filter.c
ffplay.c
libavdevice/lavfi.c

index f232106..ad69d32 100644 (file)
@@ -85,7 +85,7 @@ static int init_filters(const char *filters_descr)
     char args[512];
     int ret;
     AVFilter *abuffersrc  = avfilter_get_by_name("abuffer");
-    AVFilter *abuffersink = avfilter_get_by_name("ffabuffersink");
+    AVFilter *abuffersink = avfilter_get_by_name("abuffersink");
     AVFilterInOut *outputs = avfilter_inout_alloc();
     AVFilterInOut *inputs  = avfilter_inout_alloc();
     const enum AVSampleFormat sample_fmts[] = { AV_SAMPLE_FMT_S16, -1 };
index 520ccab..8f2c1c7 100644 (file)
@@ -85,7 +85,7 @@ static int init_filters(const char *filters_descr)
     char args[512];
     int ret;
     AVFilter *buffersrc  = avfilter_get_by_name("buffer");
-    AVFilter *buffersink = avfilter_get_by_name("ffbuffersink");
+    AVFilter *buffersink = avfilter_get_by_name("buffersink");
     AVFilterInOut *outputs = avfilter_inout_alloc();
     AVFilterInOut *inputs  = avfilter_inout_alloc();
     enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE };
index 1c30961..056b1df 100644 (file)
@@ -290,7 +290,7 @@ static int configure_output_video_filter(FilterGraph *fg, OutputFilter *ofilter,
 
     snprintf(name, sizeof(name), "output stream %d:%d", ost->file_index, ost->index);
     ret = avfilter_graph_create_filter(&ofilter->filter,
-                                       avfilter_get_by_name("ffbuffersink"),
+                                       avfilter_get_by_name("buffersink"),
                                        name, NULL, NULL, fg->graph);
     av_freep(&buffersink_params);
 
@@ -376,7 +376,7 @@ static int configure_output_audio_filter(FilterGraph *fg, OutputFilter *ofilter,
     params->all_channel_counts = 1;
     snprintf(name, sizeof(name), "output stream %d:%d", ost->file_index, ost->index);
     ret = avfilter_graph_create_filter(&ofilter->filter,
-                                       avfilter_get_by_name("ffabuffersink"),
+                                       avfilter_get_by_name("abuffersink"),
                                        name, NULL, params, fg->graph);
     av_freep(&params);
     if (ret < 0)
index c31451a..8e7d207 100644 (file)
--- a/ffplay.c
+++ b/ffplay.c
@@ -1756,7 +1756,7 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c
 
     buffersink_params->pixel_fmts = pix_fmts;
     ret = avfilter_graph_create_filter(&filt_out,
-                                       avfilter_get_by_name("ffbuffersink"),
+                                       avfilter_get_by_name("buffersink"),
                                        "ffplay_buffersink", NULL, buffersink_params, graph);
     if (ret < 0)
         goto fail;
index 3b6f0c3..89d0730 100644 (file)
@@ -103,8 +103,8 @@ av_cold static int lavfi_read_header(AVFormatContext *avctx)
 
     avfilter_register_all();
 
-    buffersink = avfilter_get_by_name("ffbuffersink");
-    abuffersink = avfilter_get_by_name("ffabuffersink");
+    buffersink = avfilter_get_by_name("buffersink");
+    abuffersink = avfilter_get_by_name("abuffersink");
 
     if (lavfi->graph_filename && lavfi->graph_str) {
         av_log(avctx, AV_LOG_ERROR,