head 1.10; access; symbols perseant-exfatfs-base-20250801:1.10 perseant-exfatfs-base-20240630:1.10 perseant-exfatfs:1.10.0.22 perseant-exfatfs-base:1.10 cjep_sun2x:1.10.0.20 cjep_sun2x-base:1.10 cjep_staticlib_x-base1:1.10 cjep_staticlib_x:1.10.0.18 cjep_staticlib_x-base:1.10 phil-wifi-20200421:1.10 phil-wifi-20200411:1.10 phil-wifi-20200406:1.10 pgoyette-compat-merge-20190127:1.10 pgoyette-compat-20190127:1.10 pgoyette-compat-20190118:1.10 pgoyette-compat-1226:1.10 pgoyette-compat-1126:1.10 pgoyette-compat-1020:1.10 pgoyette-compat-0930:1.10 pgoyette-compat-0906:1.10 pgoyette-compat-0728:1.10 pgoyette-compat-0625:1.10 pgoyette-compat-0521:1.10 pgoyette-compat-0502:1.10 pgoyette-compat-0422:1.10 pgoyette-compat-0415:1.10 pgoyette-compat-0407:1.10 pgoyette-compat-0330:1.10 pgoyette-compat-0322:1.10 pgoyette-compat-0315:1.10 pgoyette-compat:1.10.0.16 pgoyette-compat-base:1.10 prg-localcount2-base3:1.10 prg-localcount2-base2:1.10 prg-localcount2-base1:1.10 prg-localcount2:1.10.0.14 prg-localcount2-base:1.10 pgoyette-localcount-20170426:1.10 bouyer-socketcan-base1:1.10 pgoyette-localcount-20170320:1.10 bouyer-socketcan:1.10.0.12 bouyer-socketcan-base:1.10 pgoyette-localcount-20170107:1.10 pgoyette-localcount-20161104:1.10 localcount-20160914:1.10 pgoyette-localcount-20160806:1.10 pgoyette-localcount-20160726:1.10 pgoyette-localcount:1.10.0.10 pgoyette-localcount-base:1.10 netbsd-5-2-3-RELEASE:1.9 netbsd-5-1-5-RELEASE:1.9 yamt-pagecache-base9:1.10 yamt-pagecache-tag8:1.10 tls-earlyentropy:1.10.0.6 tls-earlyentropy-base:1.10 riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.10 riastradh-drm2-base3:1.10 netbsd-5-2-2-RELEASE:1.9 netbsd-5-1-4-RELEASE:1.9 netbsd-5-2-1-RELEASE:1.9 netbsd-5-1-3-RELEASE:1.9 agc-symver:1.10.0.8 agc-symver-base:1.10 tls-maxphys-base:1.10 yamt-pagecache-base8:1.10 netbsd-5-2:1.9.0.2 yamt-pagecache-base7:1.10 netbsd-5-2-RELEASE:1.9 netbsd-5-2-RC1:1.9 yamt-pagecache-base6:1.10 yamt-pagecache-base5:1.10 yamt-pagecache-base4:1.10 netbsd-5-1-2-RELEASE:1.9 netbsd-5-1-1-RELEASE:1.9 yamt-pagecache-base3:1.10 yamt-pagecache-base2:1.10 yamt-pagecache:1.10.0.4 yamt-pagecache-base:1.10 bouyer-quota2-nbase:1.10 bouyer-quota2:1.10.0.2 bouyer-quota2-base:1.10 matt-nb5-mips64-premerge-20101231:1.9 matt-nb5-pq3:1.9.0.14 matt-nb5-pq3-base:1.9 netbsd-5-1:1.9.0.12 netbsd-5-1-RELEASE:1.9 netbsd-5-1-RC4:1.9 matt-nb5-mips64-k15:1.9 netbsd-5-1-RC3:1.9 netbsd-5-1-RC2:1.9 netbsd-5-1-RC1:1.9 netbsd-5-0-2-RELEASE:1.9 matt-nb5-mips64-premerge-20091211:1.9 matt-nb5-mips64-u2-k2-k4-k7-k8-k9:1.9 matt-nb4-mips64-k7-u2a-k9b:1.9 matt-nb5-mips64-u1-k1-k5:1.9 matt-nb5-mips64:1.9.0.10 netbsd-5-0-1-RELEASE:1.9 jym-xensuspend-nbase:1.9 netbsd-5-0:1.9.0.8 netbsd-5-0-RELEASE:1.9 netbsd-5-0-RC4:1.9 netbsd-5-0-RC3:1.9 netbsd-5-0-RC2:1.9 jym-xensuspend:1.9.0.6 jym-xensuspend-base:1.9 netbsd-5-0-RC1:1.9 netbsd-5:1.9.0.4 netbsd-5-base:1.9 matt-mips64-base2:1.9 matt-mips64:1.8.0.14 netbsd-4-0-1-RELEASE:1.7.4.1 wrstuden-revivesa-base-3:1.9 wrstuden-revivesa-base-2:1.9 wrstuden-fixsa-newbase:1.7.4.1 FILE4_26:1.1.1.8 wrstuden-revivesa-base-1:1.8 yamt-pf42-base4:1.8 yamt-pf42-base3:1.8 hpcarm-cleanup-nbase:1.8 yamt-pf42-baseX:1.8 yamt-pf42-base2:1.8 wrstuden-revivesa:1.8.0.12 wrstuden-revivesa-base:1.8 yamt-pf42:1.8.0.10 yamt-pf42-base:1.8 keiichi-mipv6:1.8.0.8 keiichi-mipv6-base:1.8 matt-armv6-nbase:1.8 matt-armv6-prevmlocking:1.8 wrstuden-fixsa-base-1:1.7.4.1 netbsd-4-0:1.7.4.1.0.2 netbsd-4-0-RELEASE:1.7.4.1 cube-autoconf:1.8.0.6 cube-autoconf-base:1.8 netbsd-4-0-RC5:1.7.4.1 netbsd-4-0-RC4:1.7.4.1 netbsd-4-0-RC3:1.7.4.1 netbsd-4-0-RC2:1.7.4.1 netbsd-4-0-RC1:1.7.4.1 matt-armv6:1.8.0.4 matt-armv6-base:1.8 matt-mips64-base:1.8 hpcarm-cleanup:1.8.0.2 hpcarm-cleanup-base:1.8 netbsd-3-1-1-RELEASE:1.5.12.1 netbsd-3-0-3-RELEASE:1.5.10.1 FILE4_21:1.1.1.7 wrstuden-fixsa:1.7.0.6 wrstuden-fixsa-base:1.7.4.1 FILE4_20:1.1.1.7 abandoned-netbsd-4-base:1.7 abandoned-netbsd-4:1.7.0.2 FILE4_18:1.1.1.6 netbsd-3-1:1.5.0.12 netbsd-3-1-RELEASE:1.5 netbsd-3-0-2-RELEASE:1.5 netbsd-3-1-RC4:1.5 netbsd-3-1-RC3:1.5 netbsd-3-1-RC2:1.5 netbsd-3-1-RC1:1.5 netbsd-4:1.7.0.4 netbsd-4-base:1.7 netbsd-3-0-1-RELEASE:1.5 netbsd-3-0:1.5.0.10 netbsd-3-0-RELEASE:1.5 netbsd-3-0-RC6:1.5 netbsd-3-0-RC5:1.5 netbsd-3-0-RC4:1.5 netbsd-3-0-RC3:1.5 netbsd-3-0-RC2:1.5 netbsd-3-0-RC1:1.5 netbsd-2-0-3-RELEASE:1.5 netbsd-2-1:1.5.0.8 netbsd-2-1-RELEASE:1.5 FILE4_16:1.1.1.6 netbsd-2-1-RC6:1.5 netbsd-2-1-RC5:1.5 netbsd-2-1-RC4:1.5 netbsd-2-1-RC3:1.5 netbsd-2-1-RC2:1.5 netbsd-2-1-RC1:1.5 netbsd-2-0-2-RELEASE:1.5 netbsd-3:1.5.0.6 netbsd-3-base:1.5 FILE4_13:1.1.1.5 FILE413-BEFOREIMPORT:1.5 netbsd-2-0-1-RELEASE:1.5 netbsd-2:1.5.0.4 netbsd-2-base:1.5 FILE4_12:1.1.1.5 netbsd-2-0-RELEASE:1.5 netbsd-2-0-RC5:1.5 netbsd-2-0-RC4:1.5 netbsd-2-0-RC3:1.5 netbsd-2-0-RC2:1.5 netbsd-2-0-RC1:1.5 FILE4_10:1.1.1.5 FILE4_09:1.1.1.5 netbsd-2-0:1.5.0.2 netbsd-2-0-base:1.5 FILE4_08:1.1.1.5 FILE4_06:1.1.1.4 FILE4_04:1.1.1.3 FILE4_03:1.1.1.2 FILE4_00:1.1.1.1 CHRISTOS:1.1.1; locks; strict; comment @# @; 1.10 date 2009.10.17.23.05.38; author snj; state dead; branches; next 1.9; 1.9 date 2008.08.30.12.16.52; author christos; state Exp; branches; next 1.8; 1.8 date 2007.03.04.15.22.09; author pooka; state Exp; branches 1.8.12.1; next 1.7; 1.7 date 2006.02.13.22.57.55; author pooka; state Exp; branches 1.7.4.1 1.7.6.1; next 1.6; 1.6 date 2005.10.17.18.00.00; author pooka; state Exp; branches; next 1.5; 1.5 date 2004.03.23.08.40.12; author pooka; state Exp; branches 1.5.6.1 1.5.10.1 1.5.12.1; next 1.4; 1.4 date 2003.10.27.16.22.35; author pooka; state Exp; branches; next 1.3; 1.3 date 2003.05.25.21.46.10; author pooka; state Exp; branches; next 1.2; 1.2 date 2003.04.06.18.20.07; author wiz; state Exp; branches; next 1.1; 1.1 date 2003.03.25.22.30.32; author pooka; state Exp; branches 1.1.1.1; next ; 1.8.12.1 date 2008.09.18.04.44.41; author wrstuden; state Exp; branches; next ; 1.7.4.1 date 2007.06.15.16.14.47; author liamjfoy; state Exp; branches; next ; 1.7.6.1 date 2007.09.03.06.53.30; author wrstuden; state Exp; branches; next ; 1.5.6.1 date 2007.06.24.19.41.59; author ghen; state Exp; branches; next ; 1.5.10.1 date 2007.06.24.19.43.31; author ghen; state Exp; branches; next ; 1.5.12.1 date 2007.06.24.19.45.28; author ghen; state Exp; branches; next ; 1.1.1.1 date 2003.03.25.22.30.32; author pooka; state Exp; branches; next 1.1.1.2; 1.1.1.2 date 2003.05.25.21.29.09; author pooka; state Exp; branches; next 1.1.1.3; 1.1.1.3 date 2003.09.25.17.59.33; author pooka; state Exp; branches; next 1.1.1.4; 1.1.1.4 date 2003.10.27.16.14.33; author pooka; state Exp; branches; next 1.1.1.5; 1.1.1.5 date 2004.03.23.08.31.53; author pooka; state Exp; branches; next 1.1.1.6; 1.1.1.6 date 2005.10.17.17.48.42; author pooka; state Exp; branches; next 1.1.1.7; 1.1.1.7 date 2007.03.04.14.55.01; author pooka; state Exp; branches; next 1.1.1.8; 1.1.1.8 date 2008.08.30.11.21.10; author christos; state Exp; branches; next ; desc @@ 1.10 log @This hasn't been used in a while. Long live external/bsd/file! @ text @ #------------------------------------------------------------------------------ # riff: file(1) magic for RIFF format # See # # http://www.seanet.com/users/matts/riffmci/riffmci.htm # # AVI section extended by Patrik Rådman # 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 # RIFF wrapper for MP3 >8 string RMP3 \b, MPEG Layer 3 audio # Microsoft WAVE format (*.wav) >8 string WAVE \b, WAVE audio !:mime audio/x-wav >>20 leshort 1 \b, Microsoft PCM >>>34 leshort >0 \b, %d bit >>20 leshort 2 \b, Microsoft ADPCM >>20 leshort 6 \b, ITU G.711 A-law >>20 leshort 7 \b, ITU G.711 mu-law >>20 leshort 17 \b, IMA ADPCM >>20 leshort 20 \b, ITU G.723 ADPCM (Yamaha) >>20 leshort 49 \b, GSM 6.10 >>20 leshort 64 \b, ITU G.721 ADPCM >>20 leshort 80 \b, MPEG >>20 leshort 85 \b, MPEG Layer 3 >>22 leshort =1 \b, mono >>22 leshort =2 \b, stereo >>22 leshort >2 \b, %d channels >>24 lelong >0 %d Hz # Corel Draw Picture >8 string CDRA \b, Corel Draw Picture !:mime image/x-coreldraw # AVI == Audio Video Interleave >8 string AVI\040 \b, AVI !:mime video/x-msvideo >>12 string LIST >>>20 string hdrlavih >>>>&36 lelong x \b, %lu x >>>>&40 lelong x %lu, >>>>&4 lelong >1000000 <1 fps, >>>>&4 lelong 1000000 1.00 fps, >>>>&4 lelong 500000 2.00 fps, >>>>&4 lelong 333333 3.00 fps, >>>>&4 lelong 250000 4.00 fps, >>>>&4 lelong 200000 5.00 fps, >>>>&4 lelong 166667 6.00 fps, >>>>&4 lelong 142857 7.00 fps, >>>>&4 lelong 125000 8.00 fps, >>>>&4 lelong 111111 9.00 fps, >>>>&4 lelong 100000 10.00 fps, # ]9.9,10.1[ >>>>&4 lelong <101010 >>>>>&-4 lelong >99010 >>>>>>&-4 lelong !100000 ~10 fps, >>>>&4 lelong 83333 12.00 fps, # ]11.9,12.1[ >>>>&4 lelong <84034 >>>>>&-4 lelong >82645 >>>>>>&-4 lelong !83333 ~12 fps, >>>>&4 lelong 66667 15.00 fps, # ]14.9,15.1[ >>>>&4 lelong <67114 >>>>>&-4 lelong >66225 >>>>>>&-4 lelong !66667 ~15 fps, >>>>&4 lelong 50000 20.00 fps, >>>>&4 lelong 41708 23.98 fps, >>>>&4 lelong 41667 24.00 fps, # ]23.9,24.1[ >>>>&4 lelong <41841 >>>>>&-4 lelong >41494 >>>>>>&-4 lelong !41708 >>>>>>>&-4 lelong !41667 ~24 fps, >>>>&4 lelong 40000 25.00 fps, # ]24.9,25.1[ >>>>&4 lelong <40161 >>>>>&-4 lelong >39841 >>>>>>&-4 lelong !40000 ~25 fps, >>>>&4 lelong 33367 29.97 fps, >>>>&4 lelong 33333 30.00 fps, # ]29.9,30.1[ >>>>&4 lelong <33445 >>>>>&-4 lelong >33223 >>>>>>&-4 lelong !33367 >>>>>>>&-4 lelong !33333 ~30 fps, >>>>&4 lelong <32224 >30 fps, ##>>>>&4 lelong x (%lu) ##>>>>&20 lelong x %lu frames, # Note: The tests below assume that the AVI has 1 or 2 streams, # "vids" optionally followed by "auds". # (Should cover 99.9% of all AVIs.) # assuming avih length = 56 >>>88 string LIST >>>>96 string strlstrh >>>>>108 string vids video: >>>>>>&0 lelong 0 uncompressed # skip past vids strh >>>>>>(104.l+108) string strf >>>>>>>(104.l+132) lelong 1 RLE 8bpp >>>>>>>(104.l+132) string/c cvid Cinepak >>>>>>>(104.l+132) string/c i263 Intel I.263 >>>>>>>(104.l+132) string/c iv32 Indeo 3.2 >>>>>>>(104.l+132) string/c iv41 Indeo 4.1 >>>>>>>(104.l+132) string/c iv50 Indeo 5.0 >>>>>>>(104.l+132) string/c mp42 Microsoft MPEG-4 v2 >>>>>>>(104.l+132) string/c mp43 Microsoft MPEG-4 v3 >>>>>>>(104.l+132) string/c fmp4 FFMpeg MPEG-4 >>>>>>>(104.l+132) string/c mjpg Motion JPEG >>>>>>>(104.l+132) string/c div3 DivX 3 >>>>>>>>112 string/c div3 Low-Motion >>>>>>>>112 string/c div4 Fast-Motion >>>>>>>(104.l+132) string/c divx DivX 4 >>>>>>>(104.l+132) string/c dx50 DivX 5 >>>>>>>(104.l+132) string/c xvid XviD >>>>>>>(104.l+132) string/c h264 H.264 >>>>>>>(104.l+132) string/c wmv3 Windows Media Video 9 >>>>>>>(104.l+132) string/c h264 X.264 or H.264 >>>>>>>(104.l+132) lelong 0 ##>>>>>>>(104.l+132) string x (%.4s) # skip past first (video) LIST >>>>(92.l+96) string LIST >>>>>(92.l+104) string strlstrh >>>>>>(92.l+116) string auds \b, audio: # auds strh length = 56: >>>>>>>(92.l+172) string strf >>>>>>>>(92.l+180) leshort 0x0001 uncompressed PCM >>>>>>>>(92.l+180) leshort 0x0002 ADPCM >>>>>>>>(92.l+180) leshort 0x0006 aLaw >>>>>>>>(92.l+180) leshort 0x0007 uLaw >>>>>>>>(92.l+180) leshort 0x0050 MPEG-1 Layer 1 or 2 >>>>>>>>(92.l+180) leshort 0x0055 MPEG-1 Layer 3 >>>>>>>>(92.l+180) leshort 0x2000 Dolby AC3 >>>>>>>>(92.l+180) leshort 0x0161 DivX ##>>>>>>>>(92.l+180) leshort x (0x%.4x) >>>>>>>>(92.l+182) leshort 1 (mono, >>>>>>>>(92.l+182) leshort 2 (stereo, >>>>>>>>(92.l+182) leshort >2 (%d channels, >>>>>>>>(92.l+184) lelong x %d Hz) # auds strh length = 64: >>>>>>>(92.l+180) string strf >>>>>>>>(92.l+188) leshort 0x0001 uncompressed PCM >>>>>>>>(92.l+188) leshort 0x0002 ADPCM >>>>>>>>(92.l+188) leshort 0x0055 MPEG-1 Layer 3 >>>>>>>>(92.l+188) leshort 0x2000 Dolby AC3 >>>>>>>>(92.l+188) leshort 0x0161 DivX ##>>>>>>>>(92.l+188) leshort x (0x%.4x) >>>>>>>>(92.l+190) leshort 1 (mono, >>>>>>>>(92.l+190) leshort 2 (stereo, >>>>>>>>(92.l+190) leshort >2 (%d channels, >>>>>>>>(92.l+192) lelong x %d Hz) # Animated Cursor format >8 string ACON \b, animated cursor # SoundFont 2 >8 string sfbk SoundFont/Bank # MPEG-1 wrapped in a RIFF, apparently >8 string CDXA \b, wrapped MPEG-1 (CDXA) >8 string 4XMV \b, 4X Movie file # # 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 # Corel Draw Picture >8 string CDRA \b, Corel Draw Picture # AVI == Audio Video Interleave >8 string AVI\040 \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 # SoundFont 2 >8 string sfbk SoundFont/Bank @ 1.9 log @resolve conflicts, fix build. @ text @@ 1.8 log @apply conflict therapy for 4.20 import @ text @d36 1 d54 1 d57 1 d136 1 d138 1 a138 1 >>>>>>>(104.l+132) string/c h264 X.264 @ 1.8.12.1 log @Sync with wrstuden-revivesa-base-2. @ text @a35 1 !:mime audio/x-wav a52 1 !:mime image/x-coreldraw a54 1 !:mime video/x-msvideo a132 1 >>>>>>>(104.l+132) string/c h264 H.264 d134 1 a134 1 >>>>>>>(104.l+132) string/c h264 X.264 or H.264 @ 1.7 log @some new signatures provided by Sergey Svishchev in private email @ text @d125 1 @ 1.7.6.1 log @Sync w/ NetBSD-4-RC_1 @ text @a124 1 >>>>>>>(104.l+132) string/c fmp4 FFMpeg MPEG-4 @ 1.7.4.1 log @Pull up following (requested by pooka in ticket #724): bring file(1) to 4.21 @ text @a124 1 >>>>>>>(104.l+132) string/c fmp4 FFMpeg MPEG-4 @ 1.6 log @con conflicts into going away @ text @d32 2 d132 1 d144 3 @ 1.5 log @conflicts begone @ text @d130 1 @ 1.5.12.1 log @Pull up following revision(s) (requested by pooka in ticket #1804): dist/file/: synced with HEAD on 20070615 distrib/sets/lists/base/shl.elf: revision 1.222 distrib/sets/lists/base/shl.mi: revision 1.375 via patch lib/Makefile: revision 1.108 via patch lib/libmagic/Makefile: revision 1.5 lib/libmagic/config.h: patch lib/libmagic/shlib_version: revision 1.3-1.4 tools/file/Makefile: revision 1.4 usr.bin/file/Makefile: revision 1.51-1.53 Update file(1) to version 4.21, including security fixes (CVE-2007-1536 and CVE-2007-2799). @ text @a31 2 # RIFF wrapper for MP3 >8 string RMP3 \b, MPEG Layer 3 audio a122 1 >>>>>>>(104.l+132) string/c fmp4 FFMpeg MPEG-4 a129 2 >>>>>>>(104.l+132) string/c wmv3 Windows Media Video 9 >>>>>>>(104.l+132) string/c h264 X.264 a139 3 >>>>>>>>(92.l+180) leshort 0x0006 aLaw >>>>>>>>(92.l+180) leshort 0x0007 uLaw >>>>>>>>(92.l+180) leshort 0x0050 MPEG-1 Layer 1 or 2 @ 1.5.10.1 log @Pull up following revision(s) (requested by pooka in ticket #1804): dist/file/: synced with HEAD on 20070615 distrib/sets/lists/base/shl.elf: revision 1.222 distrib/sets/lists/base/shl.mi: revision 1.375 via patch lib/Makefile: revision 1.108 via patch lib/libmagic/Makefile: revision 1.5 lib/libmagic/config.h: patch lib/libmagic/shlib_version: revision 1.3-1.4 tools/file/Makefile: revision 1.4 usr.bin/file/Makefile: revision 1.51-1.53 Update file(1) to version 4.21, including security fixes (CVE-2007-1536 and CVE-2007-2799). @ text @a31 2 # RIFF wrapper for MP3 >8 string RMP3 \b, MPEG Layer 3 audio a122 1 >>>>>>>(104.l+132) string/c fmp4 FFMpeg MPEG-4 a129 2 >>>>>>>(104.l+132) string/c wmv3 Windows Media Video 9 >>>>>>>(104.l+132) string/c h264 X.264 a139 3 >>>>>>>>(92.l+180) leshort 0x0006 aLaw >>>>>>>>(92.l+180) leshort 0x0007 uLaw >>>>>>>>(92.l+180) leshort 0x0050 MPEG-1 Layer 1 or 2 @ 1.5.6.1 log @Pull up following revision(s) (requested by pooka in ticket #1804): dist/file/: synced with HEAD on 20070615 distrib/sets/lists/base/shl.elf: revision 1.222 distrib/sets/lists/base/shl.mi: revision 1.375 via patch lib/Makefile: revision 1.108 via patch lib/libmagic/Makefile: revision 1.5 lib/libmagic/config.h: patch lib/libmagic/shlib_version: revision 1.3-1.4 tools/file/Makefile: revision 1.4 usr.bin/file/Makefile: revision 1.51-1.53 Update file(1) to version 4.21, including security fixes (CVE-2007-1536 and CVE-2007-2799). @ text @a31 2 # RIFF wrapper for MP3 >8 string RMP3 \b, MPEG Layer 3 audio a122 1 >>>>>>>(104.l+132) string/c fmp4 FFMpeg MPEG-4 a129 2 >>>>>>>(104.l+132) string/c wmv3 Windows Media Video 9 >>>>>>>(104.l+132) string/c h264 X.264 a139 3 >>>>>>>>(92.l+180) leshort 0x0006 aLaw >>>>>>>>(92.l+180) leshort 0x0007 uLaw >>>>>>>>(92.l+180) leshort 0x0050 MPEG-1 Layer 1 or 2 @ 1.4 log @merge conflicts from 4.06 import @ text @d166 1 @ 1.3 log @there is no conflict, you are receding @ text @d8 1 a8 7 # and # # http://www.ora.com/centers/gff/formats/micriff/index.htm # # and # # http://www.jtauber.com/music/encoding/niff/spec/ a33 2 # Corel Draw Picture >8 string CDRA \b, Corel Draw Picture d49 2 d52 108 a159 1 >8 string AVI\ \b, AVI d162 4 a165 2 # Corel Draw Picture >8 string CDRA \b, Corel Draw Picture a196 2 # Corel Draw Picture >8 string CDRA \b, Corel Draw Picture d203 2 d206 1 a206 1 >8 string AVI\ \b, AVI a210 3 # Corel Draw Picture >8 string CDRA \b, Corel Draw Picture d212 1 a212 1 >8 string sfbk SoundFont 2 @ 1.2 log @Respect the law: Use A-law and mu-law as spellings as far as easily possible. Inspired by Igor Sobrado in PR 19680. @ text @d40 2 d61 2 d94 2 d108 2 @ 1.1 log @Initial revision @ text @d43 2 a44 2 >>20 leshort 6 \b, ITU G.711 a-law >>20 leshort 7 \b, ITU G.711 u-law @ 1.1.1.1 log @file 4.00 @ text @@ 1.1.1.2 log @file 4.03 small changes & fixes @ text @a39 2 # Corel Draw Picture >8 string CDRA \b, Corel Draw Picture d44 1 a44 1 >>20 leshort 7 \b, ITU G.711 mu-law a58 2 # Corel Draw Picture >8 string CDRA \b, Corel Draw Picture a89 2 # Corel Draw Picture >8 string CDRA \b, Corel Draw Picture a101 2 # Corel Draw Picture >8 string CDRA \b, Corel Draw Picture @ 1.1.1.3 log @file 4.04 fixes, patches and more magic @ text @d45 1 a45 1 >>20 leshort 6 \b, ITU G.711 A-law @ 1.1.1.4 log @file 4.06 magic and bug fixes @ text @d8 7 a14 1 # AVI section extended by Patrik Rådman d40 2 a56 2 # Corel Draw Picture >8 string CDRA \b, Corel Draw Picture d58 1 a58 108 >8 string AVI\040 \b, AVI >>12 string LIST >>>20 string hdrlavih >>>>&36 lelong x \b, %lu x >>>>&40 lelong x %lu, >>>>&4 lelong >1000000 <1 fps, >>>>&4 lelong 1000000 1.00 fps, >>>>&4 lelong 500000 2.00 fps, >>>>&4 lelong 333333 3.00 fps, >>>>&4 lelong 250000 4.00 fps, >>>>&4 lelong 200000 5.00 fps, >>>>&4 lelong 166667 6.00 fps, >>>>&4 lelong 142857 7.00 fps, >>>>&4 lelong 125000 8.00 fps, >>>>&4 lelong 111111 9.00 fps, >>>>&4 lelong 100000 10.00 fps, # ]9.9,10.1[ >>>>&4 lelong <101010 >>>>>&-4 lelong >99010 >>>>>>&-4 lelong !100000 ~10 fps, >>>>&4 lelong 83333 12.00 fps, # ]11.9,12.1[ >>>>&4 lelong <84034 >>>>>&-4 lelong >82645 >>>>>>&-4 lelong !83333 ~12 fps, >>>>&4 lelong 66667 15.00 fps, # ]14.9,15.1[ >>>>&4 lelong <67114 >>>>>&-4 lelong >66225 >>>>>>&-4 lelong !66667 ~15 fps, >>>>&4 lelong 50000 20.00 fps, >>>>&4 lelong 41708 23.98 fps, >>>>&4 lelong 41667 24.00 fps, # ]23.9,24.1[ >>>>&4 lelong <41841 >>>>>&-4 lelong >41494 >>>>>>&-4 lelong !41708 >>>>>>>&-4 lelong !41667 ~24 fps, >>>>&4 lelong 40000 25.00 fps, # ]24.9,25.1[ >>>>&4 lelong <40161 >>>>>&-4 lelong >39841 >>>>>>&-4 lelong !40000 ~25 fps, >>>>&4 lelong 33367 29.97 fps, >>>>&4 lelong 33333 30.00 fps, # ]29.9,30.1[ >>>>&4 lelong <33445 >>>>>&-4 lelong >33223 >>>>>>&-4 lelong !33367 >>>>>>>&-4 lelong !33333 ~30 fps, >>>>&4 lelong <32224 >30 fps, ##>>>>&4 lelong x (%lu) ##>>>>&20 lelong x %lu frames, # Note: The tests below assume that the AVI has 1 or 2 streams, # "vids" optionally followed by "auds". # (Should cover 99.9% of all AVIs.) # assuming avih length = 56 >>>88 string LIST >>>>96 string strlstrh >>>>>108 string vids video: >>>>>>&0 lelong 0 uncompressed # skip past vids strh >>>>>>(104.l+108) string strf >>>>>>>(104.l+132) lelong 1 RLE 8bpp >>>>>>>(104.l+132) string/c cvid Cinepak >>>>>>>(104.l+132) string/c i263 Intel I.263 >>>>>>>(104.l+132) string/c iv32 Indeo 3.2 >>>>>>>(104.l+132) string/c iv41 Indeo 4.1 >>>>>>>(104.l+132) string/c iv50 Indeo 5.0 >>>>>>>(104.l+132) string/c mp42 Microsoft MPEG-4 v2 >>>>>>>(104.l+132) string/c mp43 Microsoft MPEG-4 v3 >>>>>>>(104.l+132) string/c mjpg Motion JPEG >>>>>>>(104.l+132) string/c div3 DivX 3 >>>>>>>>112 string/c div3 Low-Motion >>>>>>>>112 string/c div4 Fast-Motion >>>>>>>(104.l+132) string/c divx DivX 4 >>>>>>>(104.l+132) string/c dx50 DivX 5 >>>>>>>(104.l+132) string/c xvid XviD >>>>>>>(104.l+132) lelong 0 ##>>>>>>>(104.l+132) string x (%.4s) # skip past first (video) LIST >>>>(92.l+96) string LIST >>>>>(92.l+104) string strlstrh >>>>>>(92.l+116) string auds \b, audio: # auds strh length = 56: >>>>>>>(92.l+172) string strf >>>>>>>>(92.l+180) leshort 0x0001 uncompressed PCM >>>>>>>>(92.l+180) leshort 0x0002 ADPCM >>>>>>>>(92.l+180) leshort 0x0055 MPEG-1 Layer 3 >>>>>>>>(92.l+180) leshort 0x2000 Dolby AC3 >>>>>>>>(92.l+180) leshort 0x0161 DivX ##>>>>>>>>(92.l+180) leshort x (0x%.4x) >>>>>>>>(92.l+182) leshort 1 (mono, >>>>>>>>(92.l+182) leshort 2 (stereo, >>>>>>>>(92.l+182) leshort >2 (%d channels, >>>>>>>>(92.l+184) lelong x %d Hz) # auds strh length = 64: >>>>>>>(92.l+180) string strf >>>>>>>>(92.l+188) leshort 0x0001 uncompressed PCM >>>>>>>>(92.l+188) leshort 0x0002 ADPCM >>>>>>>>(92.l+188) leshort 0x0055 MPEG-1 Layer 3 >>>>>>>>(92.l+188) leshort 0x2000 Dolby AC3 >>>>>>>>(92.l+188) leshort 0x0161 DivX ##>>>>>>>>(92.l+188) leshort x (0x%.4x) >>>>>>>>(92.l+190) leshort 1 (mono, >>>>>>>>(92.l+190) leshort 2 (stereo, >>>>>>>>(92.l+190) leshort >2 (%d channels, >>>>>>>>(92.l+192) lelong x %d Hz) d61 2 a62 4 # SoundFont 2 >8 string sfbk SoundFont/Bank # MPEG-1 wrapped in a RIFF, apparently >8 string CDXA \b, wrapped MPEG-1 (CDXA) d94 2 a101 2 # Corel Draw Picture >8 string CDRA \b, Corel Draw Picture d103 1 a103 1 >8 string AVI\040 \b, AVI d108 3 d112 1 a112 1 >8 string sfbk SoundFont/Bank @ 1.1.1.5 log @file 4.08: bugfixes 'n more magic 'n stuff @ text @a165 1 >8 string 4XMV \b, 4X Movie file @ 1.1.1.6 log @file 4.16 Changes since 4.13: * DragonFly ELF note support * read buffer dynamically allocated * Add -h flag and dereference symlinks if POSIXLY_CORRECT * Avoid search and regex buffer overflows * cross-compilation fixes * don't close stdin in the library. * search for elf notes in shared libraries too. Now with more magic than ever before! @ text @a129 1 >>>>>>>(104.l+132) string/c h264 X.264 @ 1.1.1.7 log @file 4.20, contains fixes to the magic parser, new syntax and a buffer overflow fix @ text @a31 2 # RIFF wrapper for MP3 >8 string RMP3 \b, MPEG Layer 3 audio a122 1 >>>>>>>(104.l+132) string/c fmp4 FFMpeg MPEG-4 a129 1 >>>>>>>(104.l+132) string/c wmv3 Windows Media Video 9 a140 3 >>>>>>>>(92.l+180) leshort 0x0006 aLaw >>>>>>>>(92.l+180) leshort 0x0007 uLaw >>>>>>>>(92.l+180) leshort 0x0050 MPEG-1 Layer 1 or 2 @ 1.1.1.8 log @try-again for file-4.26 @ text @a35 1 !:mime audio/x-wav a52 1 !:mime image/x-coreldraw a54 1 !:mime video/x-msvideo a132 1 >>>>>>>(104.l+132) string/c h264 H.264 d134 1 a134 1 >>>>>>>(104.l+132) string/c h264 X.264 or H.264 @