From: Cristy <urban-warrior@imagemagick.org>
Date: Fri, 20 Jan 2017 14:15:54 +0000 (-0500)
Subject: https://www.imagemagick.org/discourse-server/viewtopic.php?f=1&t=31265
X-Git-Tag: 7.0.4-5~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b066eae72e55b0b4ea9826ff6ce4e4f8811cc871;p=imagemagick

https://www.imagemagick.org/discourse-server/viewtopic.php?f=1&t=31265
---

diff --git a/MagickCore/coder.c b/MagickCore/coder.c
index 40bc475e6..2cfcaa29b 100644
--- a/MagickCore/coder.c
+++ b/MagickCore/coder.c
@@ -83,7 +83,8 @@ static const CoderMapInfo
   CoderMap[] =
   {
     { "3FR", "DNG" },
-    { "8BIM", "META" },
+    { "3GP", "MPEG" },
+    { "3G2", "MPEG" },
     { "8BIMTEXT", "META" },
     { "8BIMWTEXT", "META" },
     { "AFM", "TTF" },
diff --git a/coders/mpeg.c b/coders/mpeg.c
index 711af2b84..74e91d9e8 100644
--- a/coders/mpeg.c
+++ b/coders/mpeg.c
@@ -240,6 +240,16 @@ ModuleExport size_t RegisterMPEGImage(void)
   MagickInfo
     *entry;
 
+  entry=AcquireMagickInfo("MPEG","3GP","Media Container");
+  entry->decoder=(DecodeImageHandler *) ReadMPEGImage;
+  entry->flags^=CoderBlobSupportFlag;
+  entry->flags|=CoderSeekableStreamFlag;
+  (void) RegisterMagickInfo(entry);
+  entry=AcquireMagickInfo("MPEG","3G2","Media Container");
+  entry->decoder=(DecodeImageHandler *) ReadMPEGImage;
+  entry->flags^=CoderBlobSupportFlag;
+  entry->flags|=CoderSeekableStreamFlag;
+  (void) RegisterMagickInfo(entry);
   entry=AcquireMagickInfo("MPEG","AVI","Microsoft Audio/Visual Interleaved");
   entry->decoder=(DecodeImageHandler *) ReadMPEGImage;
   entry->magick=(IsImageFormatHandler *) IsAVI;
@@ -335,6 +345,8 @@ ModuleExport void UnregisterMPEGImage(void)
   (void) UnregisterMagickInfo("MPEG");
   (void) UnregisterMagickInfo("MKV");
   (void) UnregisterMagickInfo("AVI");
+  (void) UnregisterMagickInfo("3G2");
+  (void) UnregisterMagickInfo("3GP");
 }
 
 /*