Signed-off-by: Michael Niedermayer <michaelni@gmx.at>tags/n1.0
| @@ -84,7 +84,7 @@ static int init_filters(const char *filters_descr) | |||||
| char args[512]; | char args[512]; | ||||
| int ret; | int ret; | ||||
| AVFilter *abuffersrc = avfilter_get_by_name("abuffer"); | 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 *outputs = avfilter_inout_alloc(); | ||||
| AVFilterInOut *inputs = avfilter_inout_alloc(); | AVFilterInOut *inputs = avfilter_inout_alloc(); | ||||
| const enum AVSampleFormat sample_fmts[] = { AV_SAMPLE_FMT_S16, -1 }; | const enum AVSampleFormat sample_fmts[] = { AV_SAMPLE_FMT_S16, -1 }; | ||||
| @@ -84,7 +84,7 @@ static int init_filters(const char *filters_descr) | |||||
| char args[512]; | char args[512]; | ||||
| int ret; | int ret; | ||||
| AVFilter *buffersrc = avfilter_get_by_name("buffer"); | 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 *outputs = avfilter_inout_alloc(); | ||||
| AVFilterInOut *inputs = avfilter_inout_alloc(); | AVFilterInOut *inputs = avfilter_inout_alloc(); | ||||
| enum PixelFormat pix_fmts[] = { PIX_FMT_GRAY8, PIX_FMT_NONE }; | enum PixelFormat pix_fmts[] = { PIX_FMT_GRAY8, PIX_FMT_NONE }; | ||||
| @@ -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); | snprintf(name, sizeof(name), "output stream %d:%d", ost->file_index, ost->index); | ||||
| ret = avfilter_graph_create_filter(&ofilter->filter, | ret = avfilter_graph_create_filter(&ofilter->filter, | ||||
| avfilter_get_by_name("buffersink"), | |||||
| avfilter_get_by_name("ffbuffersink"), | |||||
| name, NULL, NULL/*buffersink_params*/, fg->graph); | name, NULL, NULL/*buffersink_params*/, fg->graph); | ||||
| av_freep(&buffersink_params); | 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); | snprintf(name, sizeof(name), "output stream %d:%d", ost->file_index, ost->index); | ||||
| ret = avfilter_graph_create_filter(&ofilter->filter, | ret = avfilter_graph_create_filter(&ofilter->filter, | ||||
| avfilter_get_by_name("abuffersink"), | |||||
| avfilter_get_by_name("ffabuffersink"), | |||||
| name, NULL, NULL, fg->graph); | name, NULL, NULL, fg->graph); | ||||
| if (ret < 0) | if (ret < 0) | ||||
| return ret; | return ret; | ||||
| @@ -1606,7 +1606,7 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c | |||||
| buffersink_params->pixel_fmts = pix_fmts; | buffersink_params->pixel_fmts = pix_fmts; | ||||
| ret = avfilter_graph_create_filter(&filt_out, | ret = avfilter_graph_create_filter(&filt_out, | ||||
| avfilter_get_by_name("buffersink"), | |||||
| avfilter_get_by_name("ffbuffersink"), | |||||
| "ffplay_buffersink", NULL, buffersink_params, graph); | "ffplay_buffersink", NULL, buffersink_params, graph); | ||||
| av_freep(&buffersink_params); | av_freep(&buffersink_params); | ||||
| if (ret < 0) | if (ret < 0) | ||||
| @@ -95,8 +95,8 @@ av_cold static int lavfi_read_header(AVFormatContext *avctx) | |||||
| avfilter_register_all(); | 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) | if (!lavfi->graph_str) | ||||
| lavfi->graph_str = av_strdup(avctx->filename); | lavfi->graph_str = av_strdup(avctx->filename); | ||||