head	1.4;
access;
symbols
	RELENG_4_11_0_RELEASE:1.3.8.1
	RELENG_4_11:1.3.8.1.0.18
	RELENG_4_11_BP:1.3.8.1
	RELENG_4_10_0_RELEASE:1.3.8.1
	RELENG_4_10:1.3.8.1.0.16
	RELENG_4_10_BP:1.3.8.1
	RELENG_4_9_0_RELEASE:1.3.8.1
	RELENG_4_9:1.3.8.1.0.14
	RELENG_4_9_BP:1.3.8.1
	RELENG_4_8_0_RELEASE:1.3.8.1
	RELENG_4_8:1.3.8.1.0.12
	RELENG_4_8_BP:1.3.8.1
	RELENG_4_7_0_RELEASE:1.3.8.1
	RELENG_4_7:1.3.8.1.0.10
	RELENG_4_7_BP:1.3.8.1
	RELENG_4_6_2_RELEASE:1.3.8.1
	RELENG_4_6_1_RELEASE:1.3.8.1
	RELENG_4_6_0_RELEASE:1.3.8.1
	RELENG_4_6:1.3.8.1.0.8
	RELENG_4_6_BP:1.3.8.1
	RELENG_4_5_0_RELEASE:1.3.8.1
	RELENG_4_5:1.3.8.1.0.6
	RELENG_4_5_BP:1.3.8.1
	RELENG_4_4_0_RELEASE:1.3.8.1
	RELENG_4_4:1.3.8.1.0.4
	RELENG_4_4_BP:1.3.8.1
	RELENG_4_3_0_RELEASE:1.3.8.1
	RELENG_4_3:1.3.8.1.0.2
	RELENG_4_3_BP:1.3.8.1
	RELENG_4_2_0_RELEASE:1.3
	RELENG_4_1_1_RELEASE:1.3
	PRE_SMPNG:1.3
	RELENG_4_1_0_RELEASE:1.3
	RELENG_3_5_0_RELEASE:1.3
	RELENG_4_0_0_RELEASE:1.3
	RELENG_4:1.3.0.8
	RELENG_4_BP:1.3
	RELENG_3_4_0_RELEASE:1.3
	RELENG_3_3_0_RELEASE:1.3
	RELENG_3_2_PAO:1.3.0.6
	RELENG_3_2_PAO_BP:1.3
	RELENG_3_2_0_RELEASE:1.3
	RELENG_3_1_0_RELEASE:1.3
	RELENG_3:1.3.0.4
	RELENG_3_BP:1.3
	RELENG_2_2_8_RELEASE:1.3
	RELENG_3_0_0_RELEASE:1.3
	RELENG_2_2_7_RELEASE:1.3
	RELENG_2_2_6_RELEASE:1.3
	RELENG_2_2_5_RELEASE:1.3
	RELENG_2_2_2_RELEASE:1.3
	RELENG_2_2_1_RELEASE:1.3
	file_3_22:1.1.1.2
	RELENG_2_2_0_RELEASE:1.3
	RELENG_2_1_7_RELEASE:1.1.1.1.6.1
	RELENG_2_1_6_1_RELEASE:1.1.1.1.6.1
	RELENG_2_1_6_RELEASE:1.1.1.1.6.1
	RELENG_2_2:1.3.0.2
	RELENG_2_2_BP:1.3
	RELENG_2_1_5_RELEASE:1.1.1.1.6.1
	file_3_19:1.1.1.2
	RELENG_2_1_0_RELEASE:1.1.1.1.6.1
	RELENG_2_1_0:1.1.1.1.0.6
	RELENG_2_1_0_BP:1.1.1.1
	RELENG_2_0_5_RELEASE:1.1.1.1
	RELENG_2_0_5:1.1.1.1.0.4
	RELENG_2_0_5_BP:1.1.1.1
	RELENG_2_0_5_ALPHA:1.1.1.1
	RELEASE_2_0:1.1.1.1
	BETA_2_0:1.1.1.1
	ALPHA_2_0:1.1.1.1.0.2
	file_3_14:1.1.1.1
	DARWIN:1.1.1;
locks; strict;
comment	@# @;


1.4
date	2000.11.05.09.06.06;	author obrien;	state dead;
branches;
next	1.3;

1.3
date	96.01.23.12.40.36;	author mpp;	state Exp;
branches
	1.3.8.1;
next	1.2;

1.2
date	95.07.24.03.59.15;	author mpp;	state Exp;
branches;
next	1.1;

1.1
date	94.09.03.19.16.27;	author csgr;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	94.09.03.19.16.28;	author csgr;	state Exp;
branches
	1.1.1.1.6.1;
next	1.1.1.2;

1.1.1.2
date	96.01.23.12.29.06;	author mpp;	state Exp;
branches;
next	;

1.1.1.1.6.1
date	95.10.06.01.33.08;	author davidg;	state Exp;
branches;
next	;

1.3.8.1
date	2000.11.29.19.32.51;	author obrien;	state dead;
branches;
next	;


desc
@@


1.4
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
@
#------------------------------------------------------------------------------
# zyxel:  file(1) magic for ZyXEL modems
#
# From <rob@@pe1chl.ampr.org>
# These are the /etc/magic entries to decode datafiles as used for the
# ZyXEL U-1496E DATA/FAX/VOICE modems.  (This header conforms to a
# ZyXEL-defined standard)

0	string		ZyXEL\002	ZyXEL voice data
>10	byte		0		- CELP encoding
>10	byte&0x0B	1		- ADPCM2 encoding
>10	byte&0x0B	2		- ADPCM3 encoding
>10	byte&0x0B	3		- ADPCM4 encoding
>10	byte&0x0B	8		- New ADPCM3 encoding
>10	byte&0x04	4		with resync
@


1.3
log
@Merged changes to resolve conflicts with file 3.19 import.
@
text
@@


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


1.2
log
@Add magic cookie for Zyxel modems ADPCM4 encoding.
Submitted by: Henrik Vestergaard Draboel <hvd@@terry.ping.dk>
@
text
@d1 4
d10 7
a16 6
0       string          ZyXEL\002       ZyXEL voice data
>10     byte            0               - CELP encoding
>10     byte            1               - ADPCM2 encoding
>10     byte            2               - ADPCM3 encoding
>10     byte            3               - ADPCM4 encoding

@


1.1
log
@Initial revision
@
text
@d10 2
@


1.1.1.1
log
@Bring in file 3.14 by Ian Darwin (and Christos Zoulas)

The following files were moved to different names:
- file.man -> file.1
- magic.man -> magic.5

The following file was removed:
- Magdir/Makefile
@
text
@@


1.1.1.2
log
@Upgrade to file version 3.19.
@
text
@a0 4

#------------------------------------------------------------------------------
# zyxel:  file(1) magic for ZyXEL modems
#
d6 4
a9 7
0	string		ZyXEL\002	ZyXEL voice data
>10	byte		0		- CELP encoding
>10	byte&0x0B	1		- ADPCM2 encoding
>10	byte&0x0B	2		- ADPCM3 encoding
>10	byte&0x0B	3		- ADPCM4 encoding
>10	byte&0x0B	8		- New ADPCM3 encoding
>10	byte&0x04	4		with resync
@


1.1.1.1.6.1
log
@Sync with main branch.
@
text
@a9 2
>10     byte            3               - ADPCM4 encoding

@
