Manually merged 98a7b593e72b3e7077ad4d327dbb803bde548c8c from master

diff --git a/protocol/amcp/AMCPCommandsImpl.cpp b/protocol/amcp/AMCPCommandsImpl.cpp
index eaa3f35c6f85079f7076609aa3dda7dd341a6f16..8e4e759fcbcd1014efda870014761b3d83c08c0b 100644 (file)
--- a/protocol/amcp/AMCPCommandsImpl.cpp
+++ b/protocol/amcp/AMCPCommandsImpl.cpp
@@ -183,7 +183,7 @@ std::wstring MediaInfo(const boost::filesystem::path& path)
                        extension == L"GIF" || extension == L"BMP")
                        clipttype = TEXT("STILL");
                else if(extension == TEXT(".WAV") || extension == TEXT(".MP3"))
-                       clipttype = TEXT("STILL");
+                       clipttype = TEXT("AUDIO");
                else if(extension == TEXT("SWF") || extension == TEXT("CT") || extension == TEXT("DV") || extension == TEXT("MOV") || extension == TEXT("MPG") || extension == TEXT("AVI") || caspar::ffmpeg::is_valid_file(path.wstring()))
                        clipttype = TEXT("MOVIE");