]> 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>
Fri, 19 Aug 2011 08:36:34 +0000 (08:36 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Fri, 19 Aug 2011 08:36:34 +0000 (08:36 +0000)
modules/ffmpeg/producer/format/flv.cpp

index c38c96e19f4e0f6405bf2c8e89c2d6da7e475871..e1574f5f3d9a34fcc8506155726567a0e824ea9c 100644 (file)
@@ -32,14 +32,6 @@ bool next_bool(std::fstream& fileStream)
     return bytes[0] != 0;\r
 }\r
 \r
-std::string next_string(std::fstream& fileStream)\r
-{\r
-       std::vector<char> bytes(256, 0);\r
-       fileStream.seekg(2, std::ios::cur);\r
-    fileStream.getline(bytes.data(), bytes.size(), 0);\r
-    return std::string(bytes.begin(), bytes.end());\r
-}\r
-\r
 std::map<std::string, std::string> read_flv_meta_info(const std::string& filename)\r
 {\r
        std::map<std::string, std::string>  values;\r
@@ -57,7 +49,7 @@ std::map<std::string, std::string> read_flv_meta_info(const std::string& filenam
        \r
                std::vector<char> bytes(10);\r
                fileStream.read(bytes.data(), bytes.size());\r
-               \r
+                               \r
                if(std::string(bytes.begin(), bytes.end()) == "onMetaData")\r
                {\r
                        fileStream.seekg(6, std::ios::cur);\r
@@ -85,9 +77,6 @@ std::map<std::string, std::string> read_flv_meta_info(const std::string& filenam
                                case 1:\r
                                        values[name_str] = boost::lexical_cast<std::string>(next_bool(fileStream));\r
                                        break;\r
-                               case 2:\r
-                                       values[name_str] = next_string(fileStream);\r
-                                       break;\r
                                }\r
                        }\r
                }\r