2.0. Updated namespaces.

[casparcg] / modules / ffmpeg / producer / util.h

diff --git a/modules/ffmpeg/producer/util.h b/modules/ffmpeg/producer/util.h
index f96117fc703a8b831b554b6a86384a05d2070c0b..7b32ff9f0b1c090c8b1a0f7b7cc41e66239c4dcc 100644 (file)
--- a/modules/ffmpeg/producer/util.h
+++ b/modules/ffmpeg/producer/util.h
@@ -23,12 +23,16 @@ struct frame_factory;
 \r
 }\r
 \r
+namespace ffmpeg {\r
+\r
 static const PixelFormat       CASPAR_PIX_FMT_LUMA = PIX_FMT_MONOBLACK; // Just hijack some unual pixel format.\r
 \r
-core::video_mode::type         get_mode(AVFrame& frame);\r
+core::field_mode::type         get_mode(AVFrame& frame);\r
 core::pixel_format::type       get_pixel_format(PixelFormat pix_fmt);\r
 core::pixel_format_desc                get_pixel_format_desc(PixelFormat pix_fmt, size_t width, size_t height);\r
 int                                                    make_alpha_format(int format); // NOTE: Be careful about CASPAR_PIX_FMT_LUMA, change it to PIX_FMT_GRAY8 if you want to use the frame inside some ffmpeg function.\r
 safe_ptr<core::write_frame> make_write_frame(const void* tag, const safe_ptr<AVFrame>& decoded_frame, const safe_ptr<core::frame_factory>& frame_factory, int hints);\r
 \r
-}
\ No newline at end of file
+void fix_meta_data(AVFormatContext& context);\r
+\r
+}}
\ No newline at end of file