]> 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>
Thu, 11 Aug 2011 09:10:15 +0000 (09:10 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Thu, 11 Aug 2011 09:10:15 +0000 (09:10 +0000)
modules/ffmpeg/producer/ffmpeg_producer.cpp

index 13d27dfe54dd6054c8eced1dd110a3958ffe0685..61ef743e08dd71cd0be1dab9894d9a4bd0863eb9 100644 (file)
@@ -116,7 +116,7 @@ public:
                \r
                frame_timer_.restart();\r
                \r
-               for(int n = 0; n < 8 && muxer_.empty(); ++n)\r
+               for(int n = 0; n < 4 && muxer_.empty(); ++n)\r
                        decode_frame(hints);\r
 \r
                if(!muxer_.empty())\r
@@ -236,14 +236,14 @@ safe_ptr<core::frame_producer> create_ffmpeg_producer(const safe_ptr<core::frame
        size_t start = 0;\r
        size_t length = std::numeric_limits<size_t>::max();\r
        \r
-       auto seek_it = std::find(params.begin(), params.end(), L"SEEK");\r
+       auto seek_it = boost::find(params, L"SEEK");\r
        if(seek_it != params.end())\r
        {\r
                if(++seek_it != params.end())\r
                        start = boost::lexical_cast<size_t>(*seek_it);\r
        }\r
        \r
-       auto length_it = std::find(params.begin(), params.end(), L"LENGTH");\r
+       auto length_it = boost::find(params, L"LENGTH");\r
        if(length_it != params.end())\r
        {\r
                if(++length_it != params.end())\r
@@ -251,7 +251,7 @@ safe_ptr<core::frame_producer> create_ffmpeg_producer(const safe_ptr<core::frame
        }\r
 \r
        std::wstring filter = L"";\r
-       auto filter_it = std::find(params.begin(), params.end(), L"FILTER");\r
+       auto filter_it = boost::find(params, L"FILTER");\r
        if(filter_it != params.end())\r
        {\r
                if(++filter_it != params.end())\r