2.0.2: ffmpeg_consumer: H264 only set default options if no user options have been...

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.2@1803 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/modules/ffmpeg/consumer/ffmpeg_consumer.cpp b/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
index ff162446959aa11e263b7ea0406b97b6db315906..f6796db233073de46ab53561e469ad8aa33ede88 100644 (file)
--- a/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
+++ b/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
@@ -216,10 +216,13 @@ public:
                else if(c->codec_id == CODEC_ID_H264)\r
                {                          \r
                        c->pix_fmt = PIX_FMT_YUV420P;    \r
-                       av_opt_set(c->priv_data, "preset", "ultrafast", 0);\r
-                       av_opt_set(c->priv_data, "tune",   "film",   0);\r
-                       av_opt_set(c->priv_data, "crf",    "5",     0);\r
-                       \r
+                       if(options.empty())\r
+                       {\r
+                               av_opt_set(c->priv_data, "preset", "ultrafast", 0);\r
+                               av_opt_set(c->priv_data, "tune",   "fastdecode",   0);\r
+                               av_opt_set(c->priv_data, "crf",    "5",     0);\r
+                       }\r
+\r
                        THROW_ON_ERROR2(av_set_options_string(c->priv_data, options.c_str(), "=", ":"), "[ffmpeg_consumer]");\r
                }\r
                else\r