summaryrefslogtreecommitdiff
authorNicolas George <nicolas.george@normalesup.org>2013-03-11 20:49:04 (GMT)
committer Nicolas George <nicolas.george@normalesup.org>2013-03-12 22:31:07 (GMT)
commitceac5c54dd3868e33d4e8d6b2d292e65c26368cd (patch)
treea65dae5f9b71a25a8bf0108d31f8d5fe73aac220
parent9a2688826dd479df2edd3967435afc1fb33b433f (diff)
downloadffmpeg-ceac5c54dd3868e33d4e8d6b2d292e65c26368cd.zip
ffmpeg-ceac5c54dd3868e33d4e8d6b2d292e65c26368cd.tar.gz
ffmpeg-ceac5c54dd3868e33d4e8d6b2d292e65c26368cd.tar.bz2
Remove references to the "ff" variant of buffersink.
Diffstat
-rw-r--r--doc/examples/filtering_audio.c2
-rw-r--r--doc/examples/filtering_video.c2
-rw-r--r--ffmpeg_filter.c4
-rw-r--r--ffplay.c2
-rw-r--r--libavdevice/lavfi.c4
5 files changed, 7 insertions, 7 deletions
diff --git a/doc/examples/filtering_audio.c b/doc/examples/filtering_audio.c
index f232106..ad69d32 100644
--- a/doc/examples/filtering_audio.c
+++ b/doc/examples/filtering_audio.c
@@ -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 };
diff --git a/doc/examples/filtering_video.c b/doc/examples/filtering_video.c
index 520ccab..8f2c1c7 100644
--- a/doc/examples/filtering_video.c
+++ b/doc/examples/filtering_video.c
@@ -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 };
diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c
index 1c30961..056b1df 100644
--- a/ffmpeg_filter.c
+++ b/ffmpeg_filter.c
@@ -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)
diff --git a/ffplay.c b/ffplay.c
index c31451a..8e7d207 100644
--- 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;
diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c
index 3b6f0c3..89d0730 100644
--- a/libavdevice/lavfi.c
+++ b/libavdevice/lavfi.c
@@ -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,