2.0. Updated namespaces.

[casparcg] / modules / ffmpeg / producer / format / flv.h

diff --git a/modules/ffmpeg/producer/format/flv.h b/modules/ffmpeg/producer/format/flv.h
index 8ec2265c4c00bcf49bad73b8e42b4ab91139af89..c104f5b8f36d96dddd072722dfec6e1df9d4e7c7 100644 (file)
--- a/modules/ffmpeg/producer/format/flv.h
+++ b/modules/ffmpeg/producer/format/flv.h
@@ -1,26 +1,7 @@
 #pragma once\r
 \r
-namespace caspar {\r
-          \r
-struct flv_meta_info\r
-{\r
-   double duration;\r
-   double width;\r
-   double height;\r
-   double frame_rate;\r
-   double video_data_rate;\r
-   double audio_data_rate;\r
+namespace caspar { namespace ffmpeg {\r
+       \r
+std::map<std::string, std::string> read_flv_meta_info(const std::string& filename);\r
 \r
-   flv_meta_info()\r
-          : duration(0.0)\r
-          , width(0.0)\r
-          , height(0.0)\r
-          , frame_rate(0.0)\r
-          , video_data_rate(0.0)\r
-          , audio_data_rate(0.0)\r
-   {}\r
-};\r
-\r
-flv_meta_info read_flv_meta_info(const std::wstring& filename);\r
-\r
-}
\ No newline at end of file
+}}
\ No newline at end of file