aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-08-31 22:13:16 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-09-01 06:05:08 +0200
commit3061664a576dc28c7d240206bf4e5eb48f257701 (patch)
tree4d2fa4fc2e6619e6d65cae9e5c7a1de12d73be1c
parente4e02a7d4726e9370127741eb2873d6671d3f0c3 (diff)
downloadffmpeg-3061664a576dc28c7d240206bf4e5eb48f257701.tar.gz
avoid ambigous buffersink names
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-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 4d96438b09..39f4450862 100644
--- a/doc/examples/filtering_audio.c
+++ b/doc/examples/filtering_audio.c
@@ -84,7 +84,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("abuffersink");
+ AVFilter *abuffersink = avfilter_get_by_name("ffabuffersink");
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 4bede05a61..ee5073a1ba 100644
--- a/doc/examples/filtering_video.c
+++ b/doc/examples/filtering_video.c
@@ -84,7 +84,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("buffersink");
+ AVFilter *buffersink = avfilter_get_by_name("ffbuffersink");
AVFilterInOut *outputs = avfilter_inout_alloc();
AVFilterInOut *inputs = avfilter_inout_alloc();
enum PixelFormat pix_fmts[] = { PIX_FMT_GRAY8, PIX_FMT_NONE };
diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c
index 3296576a73..b7f20cc218 100644
--- a/ffmpeg_filter.c
+++ b/ffmpeg_filter.c
@@ -294,7 +294,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("buffersink"),
+ avfilter_get_by_name("ffbuffersink"),
name, NULL, NULL/*buffersink_params*/, fg->graph);
av_freep(&buffersink_params);
@@ -377,7 +377,7 @@ static int configure_output_audio_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("abuffersink"),
+ avfilter_get_by_name("ffabuffersink"),
name, NULL, NULL, fg->graph);
if (ret < 0)
return ret;
diff --git a/ffplay.c b/ffplay.c
index 9efc93ae3d..5ed729da0c 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -1606,7 +1606,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("buffersink"),
+ avfilter_get_by_name("ffbuffersink"),
"ffplay_buffersink", NULL, buffersink_params, graph);
av_freep(&buffersink_params);
if (ret < 0)
diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c
index 20fa3e69b2..780d9a3ad3 100644
--- a/libavdevice/lavfi.c
+++ b/libavdevice/lavfi.c
@@ -95,8 +95,8 @@ av_cold static int lavfi_read_header(AVFormatContext *avctx)
avfilter_register_all();
- buffersink = avfilter_get_by_name("buffersink");
- abuffersink = avfilter_get_by_name("abuffersink");
+ buffersink = avfilter_get_by_name("ffbuffersink");
+ abuffersink = avfilter_get_by_name("ffabuffersink");
if (!lavfi->graph_str)
lavfi->graph_str = av_strdup(avctx->filename);