git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

diff --git a/modules/ffmpeg/producer/frame_muxer.cpp b/modules/ffmpeg/producer/frame_muxer.cpp
index 5402e8e29ac2054e888c26e123c39020f512afa8..7f6a0324f20e3de3bac024b0f9ffcae8354353a8 100644 (file)
--- a/modules/ffmpeg/producer/frame_muxer.cpp
+++ b/modules/ffmpeg/producer/frame_muxer.cpp
@@ -127,7 +127,7 @@ struct frame_muxer::implementation : boost::noncopyable
        display_mode::type                                                              display_mode_;\r
        const double                                                                    in_fps_;\r
        const video_format_desc                                                 format_desc_;\r
-       bool                                                                                    auto_mode_;\r
+       bool                                                                                    auto_transcode_;\r
 \r
        size_t                                                                                  audio_sample_count_;\r
        size_t                                                                                  video_frame_count_;\r
@@ -144,7 +144,7 @@ struct frame_muxer::implementation : boost::noncopyable
                , display_mode_(display_mode::invalid)\r
                , in_fps_(in_fps)\r
                , format_desc_(frame_factory->get_video_format_desc())\r
-               , auto_mode_(env::properties().get("configuration.producers.auto-transcode", false))\r
+               , auto_transcode_(env::properties().get("configuration.producers.auto-transcode", false))\r
                , audio_sample_count_(0)\r
                , video_frame_count_(0)\r
                , frame_factory_(frame_factory)\r
@@ -171,7 +171,7 @@ struct frame_muxer::implementation : boost::noncopyable
 \r
                if(display_mode_ == display_mode::invalid)\r
                {\r
-                       if(auto_mode_)\r
+                       if(auto_transcode_)\r
                        {\r
                                auto in_mode = get_mode(*video_frame);\r
                                display_mode_ = get_display_mode(in_mode, in_fps_, format_desc_.mode, format_desc_.fps);\r