From a3d8142c849c098c4931ce2cedf0157b6aa3b0fb Mon Sep 17 00:00:00 2001 From: cristy Date: Fri, 3 Apr 2015 13:00:33 +0000 Subject: [PATCH] --- MagickCore/coder.c | 1 + coders/mpeg.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/MagickCore/coder.c b/MagickCore/coder.c index 6219af75e..c674c563d 100644 --- a/MagickCore/coder.c +++ b/MagickCore/coder.c @@ -162,6 +162,7 @@ static const CoderMapInfo { "M2V", "MPEG" }, { "M4V", "MPEG" }, { "M", "RAW" }, + { "MKV", "MPEG" }, { "MNG", "PNG" }, { "MOV", "MPEG" }, { "MP4", "MPEG" }, diff --git a/coders/mpeg.c b/coders/mpeg.c index 7e5a98ca9..f38fe2d8e 100644 --- a/coders/mpeg.c +++ b/coders/mpeg.c @@ -247,6 +247,14 @@ ModuleExport size_t RegisterMPEGImage(void) entry->description=ConstantString("Microsoft Audio/Visual Interleaved"); entry->module=ConstantString("MPEG"); (void) RegisterMagickInfo(entry); + entry=SetMagickInfo("MKV"); + entry->decoder=(DecodeImageHandler *) ReadMPEGImage; + entry->encoder=(EncodeImageHandler *) WriteMPEGImage; + entry->magick=(IsImageFormatHandler *) IsMPEG; + entry->flags^=CoderBlobSupportFlag; + entry->description=ConstantString("Multimedia Container"); + entry->module=ConstantString("MPEG"); + (void) RegisterMagickInfo(entry); entry=SetMagickInfo("MOV"); entry->decoder=(DecodeImageHandler *) ReadMPEGImage; entry->encoder=(EncodeImageHandler *) WriteMPEGImage; @@ -328,12 +336,13 @@ ModuleExport size_t RegisterMPEGImage(void) ModuleExport void UnregisterMPEGImage(void) { (void) UnregisterMagickInfo("WMV"); + (void) UnregisterMagickInfo("MOV"); (void) UnregisterMagickInfo("M4V"); (void) UnregisterMagickInfo("M2V"); (void) UnregisterMagickInfo("MP4"); (void) UnregisterMagickInfo("MPG"); (void) UnregisterMagickInfo("MPEG"); - (void) UnregisterMagickInfo("MOV"); + (void) UnregisterMagickInfo("MKV"); (void) UnregisterMagickInfo("AVI"); } -- 2.40.0