From: Helge Norberg Date: Thu, 10 Nov 2016 15:35:57 +0000 (+0100) Subject: [ffmpeg_producer] Recognize .mkv and .mxf files as playable without probing X-Git-Tag: 2.1.0_Beta1~14 X-Git-Url: https://git.sesse.net/?p=casparcg;a=commitdiff_plain;h=0a272d382859a6b0eb4af2dbe37a1e86fd735b3c [ffmpeg_producer] Recognize .mkv and .mxf files as playable without probing --- diff --git a/modules/ffmpeg/producer/util/util.cpp b/modules/ffmpeg/producer/util/util.cpp index 04a237415..6ed51aa1c 100644 --- a/modules/ffmpeg/producer/util/util.cpp +++ b/modules/ffmpeg/producer/util/util.cpp @@ -579,7 +579,9 @@ bool is_valid_file(const std::wstring& filename, bool only_video) L".mpg", L".dnxhd", L".h264", - L".prores" + L".prores", + L".mkv", + L".mxf" }; auto ext = boost::to_lower_copy(boost::filesystem::path(filename).extension().wstring());