new media files from Mike Melanson

diff --git a/magic/Magdir/animation b/magic/Magdir/animation
index e1b034c1656525ebb7dfc004e4e74629c59b1348..43f3030efe1947079d225aa70569c5738b8ea4a4 100644 (file)
--- a/magic/Magdir/animation
+++ b/magic/Magdir/animation
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: animation,v 1.43 2010/09/20 19:19:16 rrt Exp $
+# $File: animation,v 1.44 2010/11/25 15:00:12 christos Exp $
 # animation:  file(1) magic for animation/movie formats
 #
 # animation formats
@@ -835,3 +835,61 @@
 # URL: http://wiki.multimedia.cx/index.php?title=NUT
 # From:        Adam Buchbinder <adam.buchbinder@gmail.com>
 0      string  nut/multimedia\ container\0     NUT multimedia container
+
+# Type: Nullsoft Video (NSV)
+# URL:  http://wiki.multimedia.cx/index.php?title=Nullsoft_Video
+# From: Mike Melanson <mike@multimedia.cx>
+0      string  NSVf    Nullsoft Video
+
+# Type: REDCode Video
+# URL:  http://www.red.com/ ; http://wiki.multimedia.cx/index.php?title=REDCode
+# From: Mike Melanson <mike@multimedia.cx>
+4      string  RED1    REDCode Video
+
+# Type: MTV Multimedia File
+# URL:  http://wiki.multimedia.cx/index.php?title=MTV
+# From: Mike Melanson <mike@multimedia.cx>
+0      string  AMVS    MTV Multimedia File
+
+# Type: ARMovie
+# URL:  http://wiki.multimedia.cx/index.php?title=ARMovie
+# From: Mike Melanson <mike@multimedia.cx>
+0      string  ARMovie\012     ARMovie
+
+# Type: Interplay MVE Movie
+# URL:  http://wiki.multimedia.cx/index.php?title=Interplay_MVE
+# From: Mike Melanson <mike@multimedia.cx>
+0      string  Interplay\040MVE\040File\032    Interplay MVE Movie
+
+# Type: Windows Television DVR File
+# URL:  http://wiki.multimedia.cx/index.php?title=WTV
+# From: Mike Melanson <mike@mutlimedia.cx>
+# This takes the form of a Windows-style GUID
+0      bequad  0xB7D800203749DA11
+>8     bequad  0xA64E0007E95EAD8D      Windows Television DVR Media
+
+# Type: Sega FILM/CPK Multimedia
+# URL:  http://wiki.multimedia.cx/index.php?title=Sega_FILM
+# From: Mike Melanson <mike@multimedia.cx>
+0      string  FILM    Sega FILM/CPK Multimedia,
+>32    belong  x       %d x
+>28    belong  x       %d
+
+# Type: Nintendo THP Multimedia
+# URL:  http://wiki.multimedia.cx/index.php?title=THP
+# From: Mike Melanson <mike@multimedia.cx>
+0      string  THP\0   Nintendo THP Multimedia
+
+# Type: BBC Dirac Video
+# URL:  http://wiki.multimedia.cx/index.php?title=Dirac
+# From: Mike Melanson <mike@multimedia.cx>
+0      string  BBCD    BBC Dirac Video
+
+# Type: RAD Game Tools Smacker Multimedia
+# URL:  http://wiki.multimedia.cx/index.php?title=Smacker
+# From: Mike Melanson <mike@multimedia.cx>
+0      string  SMK     RAD Game Tools Smacker Multimedia
+>3     byte    x       version %c,
+>4     lelong  x       %d x
+>8     lelong  x       %d,
+>12    lelong  x       %d frames

diff --git a/magic/Magdir/audio b/magic/Magdir/audio
index 46437ce29895d2b3959fe2c1b90c3fa2d4c58e69..b65d69439a5a6573aa0740a13a179d7200808b0b 100644 (file)
--- a/magic/Magdir/audio
+++ b/magic/Magdir/audio
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: audio,v 1.61 2010/09/20 19:19:16 rrt Exp $
+# $File: audio,v 1.62 2011/04/05 20:27:13 christos Exp $
 # audio:  file(1) magic for sound formats (see also "iff")
 #
 # Jan Nicolai Langfeldt (janl@ifi.uio.no), Dan Quinlan (quinlan@yggdrasil.com),
@@ -625,3 +625,13 @@
 # From: Mario Lang <mlang@debian.org>
 0      string  SCgf    SuperCollider3 Synth Definition file,
 >4     belong  x       version %d
+
+# Type: True Audio Lossless Audio
+# URL:  http://wiki.multimedia.cx/index.php?title=True_Audio
+# From: Mike Melanson <mike@multimedia.cx>
+0      string  TTA1    True Audio Lossless Audio
+
+# Type: WavPack Lossless Audio
+# URL:  http://wiki.multimedia.cx/index.php?title=WavPack
+# From: Mike Melanson <mike@multimedia.cx>
+0      string  wvpk    WavPack Lossless Audio

diff --git a/magic/Magdir/iff b/magic/Magdir/iff
index 832e266077a61cc7b201be9a46bbbd46316c4de0..1d38598098ef2da73e3ce00957cb1c2d3c0583ff 100644 (file)
--- a/magic/Magdir/iff
+++ b/magic/Magdir/iff
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File$
+# $File: iff,v 1.12 2009/09/19 16:28:09 christos Exp $
 # iff: file(1) magic for Interchange File Format (see also "audio" & "images")
 #
 # Daniel Quinlan (quinlan@yggdrasil.com) -- IFF was designed by Electronic
@@ -52,6 +52,13 @@
 >8     string          AMFF            \b, AMFF AmigaMetaFile format
 >8     string          WZRD            \b, WZRD StormWIZARD resource
 >8     string          DOC\            \b, DOC desktop publishing document
+>8     string          WVQA            \b, Westwood Studios VQA Multimedia,
+>>24   leshort         x               %d video frames,
+>>26   leshort         x               %d x
+>>28   leshort         x               %d
+>8     string          MOVE            \b, Wing Commander III Video
+>>12   string          _PC_            \b, PC version
+>>12   string          3DO_            \b, 3DO version
 
 # These go at the end of the iff rules
 #

diff --git a/magic/Magdir/riff b/magic/Magdir/riff
index ccf5ae646bf8cd70d9f35d2784dfeb888c8db1e8..2e1756d2263d2e721d87cd53ed7f7e3aa16fed66 100644 (file)
--- a/magic/Magdir/riff
+++ b/magic/Magdir/riff
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: riff,v 1.20 2010/09/20 18:55:20 rrt Exp $
+# $File: riff,v 1.21 2011/02/10 01:52:51 christos Exp $
 # riff:  file(1) magic for RIFF format
 # See
 #
@@ -179,6 +179,8 @@
 # MPEG-1 wrapped in a RIFF, apparently
 >8      string          CDXA            \b, wrapped MPEG-1 (CDXA)
 >8     string          4XMV            \b, 4X Movie file 
+# AMV-type AVI file: http://wiki.multimedia.cx/index.php?title=AMV
+>8     string          AMV\040         \b, AMV 
 
 #
 # XXX - some of the below may only appear in little-endian form.