]> git.sesse.net Git - casparcg/commitdiff
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...
authorronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Sun, 4 Dec 2011 08:12:39 +0000 (08:12 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Sun, 4 Dec 2011 08:12:39 +0000 (08:12 +0000)
modules/ffmpeg/producer/filter/filter.cpp

index 6006d5e72f2c691b5e68ca678d7e70fd3d47794e..9e189282c24f9e00357d9cc804034e710fed9be3 100644 (file)
@@ -115,11 +115,16 @@ struct filter::implementation
                                        std::stringstream args;\r
                                        args << frame->width << ":" << frame->height << ":" << frame->format << ":" << 0 << ":" << 0 << ":" << 0 << ":" << 0; // don't care about pts and aspect_ratio\r
                                        THROW_ON_ERROR2(avfilter_graph_create_filter(&buffersrc_ctx_, avfilter_get_by_name("buffer"), "src", args.str().c_str(), NULL, graph_.get()), "[filter]");\r
-\r
-                                       //safe_ptr<AVBufferSinkParams> buffersink_params(av_buffersink_params_alloc(), av_free);\r
-                                       //buffersink_params->pixel_fmts = pix_fmts_.data();\r
+                                       
+#if FF_API_OLD_VSINK_API\r
                                        THROW_ON_ERROR2(avfilter_graph_create_filter(&buffersink_ctx_, avfilter_get_by_name("buffersink"), "out", NULL, pix_fmts_.data(), graph_.get()), "[filter]");\r
-                       \r
+#else\r
+                                       safe_ptr<AVBufferSinkParams> buffersink_params(av_buffersink_params_alloc(), av_free);\r
+                                       buffersink_params->pixel_fmts = pix_fmts_.data();\r
+                                       THROW_ON_ERROR2(avfilter_graph_create_filter(&buffersink_ctx_, avfilter_get_by_name("buffersink"), "out", NULL, buffersink_params.get(), graph_.get()), "[filter]");\r
+\r
+#endif\r
+\r
                                        AVFilterInOut* outputs = avfilter_inout_alloc();\r
                                        AVFilterInOut* inputs  = avfilter_inout_alloc();\r
                        \r