From: ronag Date: Fri, 19 Aug 2011 08:36:34 +0000 (+0000) Subject: git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches... X-Git-Tag: 2.0.1~117 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=ce2fa355836e24aeee84cd585c9a1ad905a63c21;p=casparcg git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@1223 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d --- diff --git a/modules/ffmpeg/producer/format/flv.cpp b/modules/ffmpeg/producer/format/flv.cpp index c38c96e19..e1574f5f3 100644 --- a/modules/ffmpeg/producer/format/flv.cpp +++ b/modules/ffmpeg/producer/format/flv.cpp @@ -32,14 +32,6 @@ bool next_bool(std::fstream& fileStream) return bytes[0] != 0; } -std::string next_string(std::fstream& fileStream) -{ - std::vector bytes(256, 0); - fileStream.seekg(2, std::ios::cur); - fileStream.getline(bytes.data(), bytes.size(), 0); - return std::string(bytes.begin(), bytes.end()); -} - std::map read_flv_meta_info(const std::string& filename) { std::map values; @@ -57,7 +49,7 @@ std::map read_flv_meta_info(const std::string& filenam std::vector bytes(10); fileStream.read(bytes.data(), bytes.size()); - + if(std::string(bytes.begin(), bytes.end()) == "onMetaData") { fileStream.seekg(6, std::ios::cur); @@ -85,9 +77,6 @@ std::map read_flv_meta_info(const std::string& filenam case 1: values[name_str] = boost::lexical_cast(next_bool(fileStream)); break; - case 2: - values[name_str] = next_string(fileStream); - break; } } }