]> granicus.if.org Git - imagemagick/commitdiff
https://www.imagemagick.org/discourse-server/viewtopic.php?f=1&t=31265
authorCristy <urban-warrior@imagemagick.org>
Fri, 20 Jan 2017 14:15:54 +0000 (09:15 -0500)
committerCristy <urban-warrior@imagemagick.org>
Fri, 20 Jan 2017 14:15:54 +0000 (09:15 -0500)
MagickCore/coder.c
coders/mpeg.c

index 40bc475e6024977ea62e7d3f159535564b5be91e..2cfcaa29b8ded8b77537d417db92afcb03ee1c68 100644 (file)
@@ -83,7 +83,8 @@ static const CoderMapInfo
   CoderMap[] =
   {
     { "3FR", "DNG" },
-    { "8BIM", "META" },
+    { "3GP", "MPEG" },
+    { "3G2", "MPEG" },
     { "8BIMTEXT", "META" },
     { "8BIMWTEXT", "META" },
     { "AFM", "TTF" },
index 711af2b84ba6cc3480320f5a8c860115d9c3a375..74e91d9e81160b7cb2ffa683d6d8f2d00bc92dbe 100644 (file)
@@ -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");
 }
 \f
 /*