2.1.0. -ffmpeg_producer: Optimized is_valid_file.

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

diff --git a/modules/ffmpeg/producer/util/util.cpp b/modules/ffmpeg/producer/util/util.cpp
index f443da00e12466f0f339cae419d55865035ef881..d78abdba6c77bd11c0bf78f97124bdc0be3efb00 100644 (file)
--- a/modules/ffmpeg/producer/util/util.cpp
+++ b/modules/ffmpeg/producer/util/util.cpp
@@ -510,6 +510,13 @@ bool is_valid_file(const std::wstring filename)
 {                      \r
        if(boost::filesystem::path(filename).extension() == ".m2t")\r
                return true;\r
+       \r
+       AVProbeData pb = {};\r
+       pb.filename = u8(filename).c_str();\r
+\r
+       int score = 0;\r
+       if(av_probe_input_format2(&pb, false, &score) != nullptr)\r
+               return true;\r
 \r
        std::ifstream file(filename);\r
 \r
@@ -520,12 +527,9 @@ bool is_valid_file(const std::wstring filename)
        if(buf.empty())\r
                return nullptr;\r
 \r
-       AVProbeData pb;\r
-       pb.filename = u8(filename).c_str();\r
        pb.buf          = buf.data();\r
        pb.buf_size = static_cast<int>(buf.size());\r
 \r
-       int score = 0;\r
        return av_probe_input_format2(&pb, true, &score) != nullptr;\r
 }\r
 \r