git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

diff --git a/modules/ffmpeg/producer/ffmpeg_producer.cpp b/modules/ffmpeg/producer/ffmpeg_producer.cpp
index 7f5e754d50be58a6eb79fa621eba3a3e301ac542..6638d0c2bab83d75d055cdb010ec45e0693e5ebe 100644 (file)
--- a/modules/ffmpeg/producer/ffmpeg_producer.cpp
+++ b/modules/ffmpeg/producer/ffmpeg_producer.cpp
@@ -330,6 +330,7 @@ safe_ptr<core::frame_producer> create_producer(const safe_ptr<core::frame_factor
                (L"dv")         \r
                (L"f4v")(L"flv")\r
                (L"mkv")(L"mka")\r
+               (L"mxf")\r
                (L"wmv")(L"wma")(L"wav")\r
                (L"rm")(L"ram")\r
                (L"ogg")(L"ogv")(L"oga")(L"ogx")\r

diff --git a/protocol/amcp/AMCPCommandsImpl.cpp b/protocol/amcp/AMCPCommandsImpl.cpp
index eb09bb190e18dd5c9d3d29345c72d2e98f48863e..283dad13bf17c4d08278288f0e3634aafacf5a59 100644 (file)
--- a/protocol/amcp/AMCPCommandsImpl.cpp
+++ b/protocol/amcp/AMCPCommandsImpl.cpp
@@ -98,7 +98,7 @@ std::wstring MediaInfo(const boost::filesystem::wpath& path)
                else if(extension == TEXT(".SWF") || extension == TEXT(".DV") || extension == TEXT(".MOV") || extension == TEXT(".MPG") || \r
                                extension == TEXT(".AVI") || extension == TEXT(".FLV") || extension == TEXT(".F4V") || extension == TEXT(".MP4") ||\r
                                extension == L".M2V" || extension == L".H264" || extension == L".MKV" || extension == L".WMV" || extension == L".DIVX" || \r
-                               extension == L".XVID" || extension == L".OGG" || extension == L".CT")\r
+                               extension == L".XVID" || extension == L".OGG" || extension == L".CT" || extension == L".MXF)\r
                        clipttype = TEXT(" MOVIE ");\r
                else if(extension == TEXT(".WAV") || extension == TEXT(".MP3"))\r
                        clipttype = TEXT(" STILL ");\r