More magic

5 files changed, 92 insertions, 9 deletions

diff --git a/magic/Magdir/audio b/magic/Magdir/audio
index 17011b65..6c9fcb39 100644
--- a/magic/Magdir/audio
+++ b/magic/Magdir/audio
@@ -320,9 +320,42 @@
 >20	string		Ver01.00	Ver. 1.00
 >>32	byte		x		, %d tracks
 
-# FLAC audio stream <URL:http://flac.sourceforge.net/>
-# From: Dan Fandrich <dan@coneharvesters.com>
-0	string		fLaC		FLAC audio stream data
+# Free lossless audio codec <http://flac.sourceforge.net>
+# From: Przemyslaw Augustyniak <silvathraec@rpg.pl>
+0	string			fLaC		FLAC audio bitstream data
+>4	byte&0x7f		>0		\b, unknown version
+>4	byte&0x7f		0		\b
+# some common bits/sample values
+>>20	beshort&0x1f0		0x030		\b, 4 bit
+>>20	beshort&0x1f0		0x050		\b, 6 bit
+>>20	beshort&0x1f0		0x070		\b, 8 bit
+>>20	beshort&0x1f0		0x0b0		\b, 12 bit
+>>20	beshort&0x1f0		0x0f0		\b, 16 bit
+>>20	beshort&0x1f0		0x170		\b, 24 bit
+>>20	byte&0xe		0x0		\b, mono
+>>20	byte&0xe		0x2		\b, stereo
+>>20	byte&0xe		0x4		\b, 3 channels
+>>20	byte&0xe		0x6		\b, 4 channels
+>>20	byte&0xe		0x8		\b, 5 channels
+>>20	byte&0xe		0xa		\b, 6 channels
+>>20	byte&0xe		0xc		\b, 7 channels
+>>20	byte&0xe		0xe		\b, 8 channels
+# some common sample rates
+>>17	belong&0xfffff0		0x0ac440	\b, 44.1 kHz
+>>17	belong&0xfffff0		0x0bb800	\b, 48 kHz
+>>17	belong&0xfffff0		0x07d000	\b, 32 kHz
+>>17	belong&0xfffff0		0x056220	\b, 22.05 kHz
+>>17	belong&0xfffff0		0x05dc00	\b, 24 kHz
+>>17	belong&0xfffff0		0x03e800	\b, 16 kHz
+>>17	belong&0xfffff0		0x02b110	\b, 11.025 kHz
+>>17	belong&0xfffff0		0x02ee00	\b, 12 kHz
+>>17	belong&0xfffff0		0x01f400	\b, 8 kHz
+>>17	belong&0xfffff0		0x177000	\b, 96 kHz
+>>17	belong&0xfffff0		0x0fa000	\b, 64 kHz
+>>21	byte&0xf		>0		\b, >4G samples
+>>21	byte&0xf		0		\b
+>>>22	belong			>0		\b, %u samples
+>>>22	belong			0		\b, length unknown
 
 # (ISDN) VBOX voice message file (Wolfram Kleff)
 0       string          VBOX            VBOX voice message data
diff --git a/magic/Magdir/games b/magic/Magdir/games
index 476be171..2dc17da6 100644
--- a/magic/Magdir/games
+++ b/magic/Magdir/games
@@ -151,3 +151,7 @@
 0	string	5\x0aSlaughterhouse		 Quake I save: ddm5 Slaughterhouse
 0	string	5\x0aDOMINO			 Quake I save: ddm6 Domino
 0	string	5\x0aSANDRA'S_LADDER		 Quake I save: ddm7 Sandra's ladder
+
+
+0	string	MComprHD	MAME CHD compressed hard disk image,
+>12	belong	x		version %lu
diff --git a/magic/Magdir/images b/magic/Magdir/images
index 61792c02..037bb7e9 100644
--- a/magic/Magdir/images
+++ b/magic/Magdir/images
@@ -484,3 +484,20 @@
 # offsets for the respective PCX components.
 # From: Joerg Wunsch <joerg_wunsch@uriah.heep.sax.de>
 0	lelong	987654321	DCX multi-page PCX image data
+
+# Simon Walton <simonw@matteworld.com>
+# Kodak Cineon format for scanned negatives
+# http://www.kodak.com/US/en/motion/support/dlad/
+0	lelong  0xd75f2a80	Cineon image data
+>200	belong  >0		\b, %ld x
+>204	belong  >0		%ld
+
+
+# Bio-Rad .PIC is an image format used by microscope control systems
+# and related image processing software used by biologists.
+# From: Vebjorn Ljosa <vebjorn@ljosa.com>
+54		leshort 12345		Bio-Rad .PIC Image File
+>0		leshort >0		%hd x
+>2		leshort >0		%hd,
+>4		leshort =1		1 image in file
+>4		leshort >1		%hd images in file
diff --git a/magic/Magdir/sniffer b/magic/Magdir/sniffer
index 626439e1..b45b63e9 100644
--- a/magic/Magdir/sniffer
+++ b/magic/Magdir/sniffer
@@ -9,23 +9,25 @@
 # Microsoft Network Monitor 1.x capture files.
 #
 0	string		RTSS		NetMon capture file
->4	byte		x		- version %d
->5	byte		x		\b.%d
+>5	byte		x		- version %d
+>4	byte		x		\b.%d
 >6	leshort		0		(Unknown)
 >6	leshort		1		(Ethernet)
 >6	leshort		2		(Token Ring)
 >6	leshort		3		(FDDI)
+>6	leshort		4		(ATM)
 
 #
 # Microsoft Network Monitor 2.x capture files.
 #
 0	string		GMBU		NetMon capture file
->4	byte		x		- version %d
->5	byte		x		\b.%d
+>5	byte		x		- version %d
+>4	byte		x		\b.%d
 >6	leshort		0		(Unknown)
 >6	leshort		1		(Ethernet)
 >6	leshort		2		(Token Ring)
 >6	leshort		3		(FDDI)
+>6	leshort		4		(ATM)
 
 #
 # Network General Sniffer capture files.
@@ -58,6 +60,9 @@
 >44	leshort		0		(Ethernet)
 >44	leshort		1		(Token Ring)
 >44	leshort		2		(FDDI)
+>44	leshort		3		(WAN)
+>44	leshort		8		(ATM)
+>44	leshort		9		(802.11)
 
 #
 # "libpcap" capture files.
@@ -75,7 +80,7 @@
 >20	belong		4		(ProNET
 >20	belong		5		(CHAOS
 >20	belong		6		(Token Ring
->20	belong		7		(ARCNET
+>20	belong		7		(BSD ARCNET
 >20	belong		8		(SLIP
 >20	belong		9		(PPP
 >20	belong		10		(FDDI
@@ -92,10 +97,21 @@
 >20	belong		104		(BSD/OS Cisco HDLC
 >20	belong		105		(802.11
 >20	belong		106		(Linux Classical IP over ATM
+>20	belong		107		(Frame Relay
 >20	belong		108		(OpenBSD loopback
->20	belong		109		(OpenBSD IPSEC encrypted
+>20	belong		109		(OpenBSD IPsec encrypted
+>20	belong		112		(Cisco HDLC
 >20	belong		113		(Linux "cooked"
 >20	belong		114		(LocalTalk
+>20	belong		117		(OpenBSD PFLOG
+>20	belong		119		(802.11 with Prism header
+>20	belong		123		(SunATM
+>20	belong		127		(802.11 with radiotap header
+>20	belong		129		(Linux ARCNET
+>20	belong		140		(MTP2
+>20	belong		141		(MTP3
+>20	belong		143		(DOCSIS
+>20	belong		144		(IrDA
 >16	belong		x		\b, capture length %d)
 0	ulelong		0xa1b2c3d4	tcpdump capture file (little-endian)
 >4	leshort		x		- version %d
@@ -124,10 +140,21 @@
 >20	lelong		104		(BSD/OS Cisco HDLC
 >20	lelong		105		(802.11
 >20	lelong		106		(Linux Classical IP over ATM
+>20	lelong		107		(Frame Relay
 >20	lelong		108		(OpenBSD loopback
 >20	lelong		109		(OpenBSD IPSEC encrypted
+>20	lelong		112		(Cisco HDLC
 >20	lelong		113		(Linux "cooked"
 >20	lelong		114		(LocalTalk
+>20	lelong		117		(OpenBSD PFLOG
+>20	lelong		119		(802.11 with Prism header
+>20	lelong		123		(SunATM
+>20	lelong		127		(802.11 with radiotap header
+>20	lelong		129		(Linux ARCNET
+>20	lelong		140		(MTP2
+>20	lelong		141		(MTP3
+>20	lelong		143		(DOCSIS
+>20	lelong		144		(IrDA
 >16	lelong		x		\b, capture length %d)
 
 #
@@ -178,6 +205,7 @@
 #
 # AIX "iptrace" capture files.
 #
+0	string		iptrace\ 1.0	"iptrace" capture file
 0	string		iptrace\ 2.0	"iptrace" capture file
 
 #
diff --git a/magic/Magdir/wordprocessors b/magic/Magdir/wordprocessors
index 1edaf143..9b122c14 100644
--- a/magic/Magdir/wordprocessors
+++ b/magic/Magdir/wordprocessors
@@ -108,3 +108,4 @@
 
 # CosmicBook, from Benoît Rouits
 0       string  CSBK    Ted Neslson's CosmicBook hypertext file
+