From: ronag Date: Sun, 4 Dec 2011 08:12:39 +0000 (+0000) Subject: git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches... X-Git-Tag: 2.0.2~28 X-Git-Url: https://git.sesse.net/?p=casparcg;a=commitdiff_plain;h=51c1b47e8a5dd92e4f8516cccf95e485304adf21 git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.2@1771 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d --- diff --git a/modules/ffmpeg/producer/filter/filter.cpp b/modules/ffmpeg/producer/filter/filter.cpp index 6006d5e72..9e189282c 100644 --- a/modules/ffmpeg/producer/filter/filter.cpp +++ b/modules/ffmpeg/producer/filter/filter.cpp @@ -115,11 +115,16 @@ struct filter::implementation std::stringstream args; args << frame->width << ":" << frame->height << ":" << frame->format << ":" << 0 << ":" << 0 << ":" << 0 << ":" << 0; // don't care about pts and aspect_ratio THROW_ON_ERROR2(avfilter_graph_create_filter(&buffersrc_ctx_, avfilter_get_by_name("buffer"), "src", args.str().c_str(), NULL, graph_.get()), "[filter]"); - - //safe_ptr buffersink_params(av_buffersink_params_alloc(), av_free); - //buffersink_params->pixel_fmts = pix_fmts_.data(); + +#if FF_API_OLD_VSINK_API THROW_ON_ERROR2(avfilter_graph_create_filter(&buffersink_ctx_, avfilter_get_by_name("buffersink"), "out", NULL, pix_fmts_.data(), graph_.get()), "[filter]"); - +#else + safe_ptr buffersink_params(av_buffersink_params_alloc(), av_free); + buffersink_params->pixel_fmts = pix_fmts_.data(); + THROW_ON_ERROR2(avfilter_graph_create_filter(&buffersink_ctx_, avfilter_get_by_name("buffersink"), "out", NULL, buffersink_params.get(), graph_.get()), "[filter]"); + +#endif + AVFilterInOut* outputs = avfilter_inout_alloc(); AVFilterInOut* inputs = avfilter_inout_alloc();