]> git.sesse.net Git - casparcg/commitdiff
ffmpeg_consumer: Fixed set_opt for video codec.
authorronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Wed, 16 May 2012 10:17:10 +0000 (10:17 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Wed, 16 May 2012 10:17:10 +0000 (10:17 +0000)
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@3068 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

modules/ffmpeg/consumer/ffmpeg_consumer.cpp

index 65c1558fdaa111d3f1a551f121c754f4b3d823cf..1213b7d7bd688326d053ef1c47789801bfb46504 100644 (file)
@@ -387,7 +387,8 @@ public:
                                \r
                boost::range::remove_erase_if(options, [&](const option& o)\r
                {\r
-                       return ffmpeg::av_opt_set(c, o.name.c_str(), o.value.c_str(), AV_OPT_SEARCH_CHILDREN) > -1;\r
+                       return ffmpeg::av_opt_set(c, o.name.c_str(), o.value.c_str(), AV_OPT_SEARCH_CHILDREN) > -1 ||\r
+                                  ffmpeg::av_opt_set(c->priv_data, o.name.c_str(), o.value.c_str(), AV_OPT_SEARCH_CHILDREN) > -1;\r
                });\r
                                \r
                if(output_format_.format->flags & AVFMT_GLOBALHEADER)\r