head	1.2;
access;
symbols
	RELENG_4_11_0_RELEASE:1.1.6.1
	RELENG_4_11:1.1.6.1.0.18
	RELENG_4_11_BP:1.1.6.1
	RELENG_4_10_0_RELEASE:1.1.6.1
	RELENG_4_10:1.1.6.1.0.16
	RELENG_4_10_BP:1.1.6.1
	RELENG_4_9_0_RELEASE:1.1.6.1
	RELENG_4_9:1.1.6.1.0.14
	RELENG_4_9_BP:1.1.6.1
	RELENG_4_8_0_RELEASE:1.1.6.1
	RELENG_4_8:1.1.6.1.0.12
	RELENG_4_8_BP:1.1.6.1
	RELENG_4_7_0_RELEASE:1.1.6.1
	RELENG_4_7:1.1.6.1.0.10
	RELENG_4_7_BP:1.1.6.1
	RELENG_4_6_2_RELEASE:1.1.6.1
	RELENG_4_6_1_RELEASE:1.1.6.1
	RELENG_4_6_0_RELEASE:1.1.6.1
	RELENG_4_6:1.1.6.1.0.8
	RELENG_4_6_BP:1.1.6.1
	RELENG_4_5_0_RELEASE:1.1.6.1
	RELENG_4_5:1.1.6.1.0.6
	RELENG_4_5_BP:1.1.6.1
	RELENG_4_4_0_RELEASE:1.1.6.1
	RELENG_4_4:1.1.6.1.0.4
	RELENG_4_4_BP:1.1.6.1
	RELENG_4_3_0_RELEASE:1.1.6.1
	RELENG_4_3:1.1.6.1.0.2
	RELENG_4_3_BP:1.1.6.1
	RELENG_4_2_0_RELEASE:1.1
	RELENG_4_1_1_RELEASE:1.1
	PRE_SMPNG:1.1
	RELENG_4_1_0_RELEASE:1.1
	RELENG_3_5_0_RELEASE:1.1
	RELENG_4_0_0_RELEASE:1.1
	RELENG_4:1.1.0.6
	RELENG_4_BP:1.1
	RELENG_3_4_0_RELEASE:1.1
	RELENG_3_3_0_RELEASE:1.1
	RELENG_3_2_PAO:1.1.0.4
	RELENG_3_2_PAO_BP:1.1
	RELENG_3_2_0_RELEASE:1.1
	RELENG_3_1_0_RELEASE:1.1
	RELENG_3:1.1.0.2
	RELENG_3_BP:1.1;
locks; strict;
comment	@# @;


1.2
date	2000.11.05.09.06.05;	author obrien;	state dead;
branches;
next	1.1;

1.1
date	98.11.15.03.35.10;	author obrien;	state Exp;
branches
	1.1.6.1;
next	;

1.1.6.1
date	2000.11.29.19.32.50;	author obrien;	state dead;
branches;
next	;


desc
@@


1.2
log
@Switch over to using the Christos Zoulas maintained version in contrib/
This also gives use the same exact results as NetBSD, thus sharing more
code with our bretheren.
@
text
@
#------------------------------------------------------------------------------
# riff:  file(1) magic for RIFF format
# See
#
#	http://www.seanet.com/users/matts/riffmci/riffmci.htm
#
# and
#
#	http://www.ora.com/centers/gff/formats/micriff/index.htm
#
# and
#
#	http://www.jtauber.com/music/encoding/niff/spec/
#
0	string		RIFF		RIFF (little-endian) data
# RIFF Palette format
>8	string		PAL		\b, palette
>>16	leshort		x		\b, version %d
>>18	leshort		x		\b, %d entries
# RIFF Device Independent Bitmap format
>8	string		RDIB		\b, device-independent bitmap
>>16	string		BM		
>>>30	leshort		12		\b, OS/2 1.x format
>>>>34	leshort		x		\b, %d x
>>>>36	leshort		x		%d
>>>30	leshort		64		\b, OS/2 2.x format
>>>>34	leshort		x		\b, %d x
>>>>36	leshort		x		%d
>>>30	leshort		40		\b, Windows 3.x format
>>>>34	lelong		x		\b, %d x
>>>>38	lelong		x		%d x
>>>>44	leshort		x		%d
# RIFF MIDI format
>8	string		RMID		\b, MIDI
# RIFF Multimedia Movie File format
>8	string		RMMP		\b, multimedia movie
# Microsoft WAVE format (*.wav)
>8	string		WAVE		\b, WAVE audio
>>20	leshort		1		\b, Microsoft PCM
>>>34	leshort		>0		\b, %d bit
>>22	leshort		=1		\b, mono
>>22	leshort		=2		\b, stereo
>>22	leshort		>2		\b, %d channels
>>24	lelong		>0		%d Hz
# AVI == Audio Video Interleave
>8      string          AVI\            \b, AVI
# Animated Cursor format
>8	string		ACON		\b, animated cursor

#
# XXX - some of the below may only appear in little-endian form.
#
# Also "MV93" appears to be for one form of Macromedia Director
# files, and "GDMF" appears to be another multimedia format.
#
0	string		RIFX		RIFF (big-endian) data
# RIFF Palette format
>8	string		PAL		\b, palette
>>16	beshort		x		\b, version %d
>>18	beshort		x		\b, %d entries
# RIFF Device Independent Bitmap format
>8	string		RDIB		\b, device-independent bitmap
>>16	string		BM		
>>>30	beshort		12		\b, OS/2 1.x format
>>>>34	beshort		x		\b, %d x
>>>>36	beshort		x		%d
>>>30	beshort		64		\b, OS/2 2.x format
>>>>34	beshort		x		\b, %d x
>>>>36	beshort		x		%d
>>>30	beshort		40		\b, Windows 3.x format
>>>>34	belong		x		\b, %d x
>>>>38	belong		x		%d x
>>>>44	beshort		x		%d
# RIFF MIDI format
>8	string		RMID		\b, MIDI
# RIFF Multimedia Movie File format
>8	string		RMMP		\b, multimedia movie
# Microsoft WAVE format (*.wav)
>8	string		WAVE		\b, WAVE audio
>>20	leshort		1		\b, Microsoft PCM
>>>34	leshort		>0		\b, %d bit
>>22	beshort		=1		\b, mono
>>22	beshort		=2		\b, stereo
>>22	beshort		>2		\b, %d channels
>>24	belong		>0		%d Hz
# AVI == Audio Video Interleave
>8      string          AVI\            \b, AVI
# Animated Cursor format
>8	string		ACON		\b, animated cursor
# Notation Interchange File Format (big-endian only)
>8	string		NIFF		\b, Notation Interchange File Format

@


1.1
log
@New file formats.

Obtained from:	NetBSD-current/src/usr.bin/file/magdir
@
text
@@


1.1.6.1
log
@MFC: switch over to using the Christos Zoulas maintained version in contrib/
@
text
@@


