From: ronag Date: Thu, 18 Aug 2011 15:08:41 +0000 (+0000) Subject: git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches... X-Git-Tag: 2.0.1~124 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=4160e5fb57f86160549de22b63c710ce339b4feb;p=casparcg git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@1216 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d --- diff --git a/modules/ffmpeg/producer/format/flv.cpp b/modules/ffmpeg/producer/format/flv.cpp index 3a4b4c27d..c38c96e19 100644 --- a/modules/ffmpeg/producer/format/flv.cpp +++ b/modules/ffmpeg/producer/format/flv.cpp @@ -12,28 +12,16 @@ namespace caspar { -double to_double(std::vector bytes, bool readInReverse) -{ - if(bytes.size() != 8) - BOOST_THROW_EXCEPTION(caspar_exception()); - - if (readInReverse) - std::reverse(bytes.begin(), bytes.end()); - - static_assert(sizeof(double) == 8, ""); - - double* tmp = (double*)bytes.data(); - - double val = *tmp; - return val; -} - double next_double(std::fstream& fileStream) { std::vector bytes(8); fileStream.read(bytes.data(), bytes.size()); fileStream.seekg(1, std::ios::cur); - return to_double(bytes, true); + + std::reverse(bytes.begin(), bytes.end()); + double* tmp = (double*)bytes.data(); + + return *tmp; } bool next_bool(std::fstream& fileStream)