PR/247: Add mime type for Web/P and remove the commented out entry in images

diff --git a/magic/Magdir/images b/magic/Magdir/images
index 173e5098ef371a4ac649f26db1d04c23423d2396..b4fd1a93fa7771231b4d8d2ad9778809b4a68383 100644 (file)
--- a/magic/Magdir/images
+++ b/magic/Magdir/images
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: images,v 1.103 2015/01/06 02:06:35 christos Exp $
+# $File: images,v 1.104 2015/01/24 22:45:46 christos Exp $
 # images:  file(1) magic for image formats (see also "iff", and "c-lang" for
 # XPM bitmaps)
 #
@@ -1044,11 +1044,6 @@
 # From: "Tano M. Fotang" <mfotang@quanteq.com>
 0      string  \x46\x4d\x52\x00        ISO/IEC 19794-2 Format Minutiae Record (FMR)
 
-# WEBP https://developers.google.com/speed/webp/docs/riff_container
-#0     string  RIFF
-#>8    string  WEBP    Web/P image data
-#>>4   lelong  x       \b, %d bytes
-
 # doc: http://www.shikino.co.jp/eng/products/images/FLOWER.jpg.zip
 # example: http://www.shikino.co.jp/eng/products/images/FLOWER.wdp.zip
 90     bequad          0x574D50484F544F00      JPEG-XR Image

diff --git a/magic/Magdir/riff b/magic/Magdir/riff
index 3bb2f9c352cc31d6163813702a3aad8fa6e5827c..1da4c8dd85ff1ffdc9385b2c0a810c508066b18d 100644 (file)
--- a/magic/Magdir/riff
+++ b/magic/Magdir/riff
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: riff,v 1.29 2014/09/15 15:10:42 christos Exp $
+# $File: riff,v 1.30 2014/09/23 17:02:12 christos Exp $
 # riff:  file(1) magic for RIFF format
 # See
 #
@@ -230,6 +230,7 @@
 # AMV-type AVI file: http://wiki.multimedia.cx/index.php?title=AMV
 >8     string          AMV\040         \b, AMV 
 >8      string          WEBP            \b, Web/P image
+!:mime image/webp
 >>12   use             riff-walk
 
 #