From f0499a7d28bdf1b49a7c91e0ae10497e3380d2b1 Mon Sep 17 00:00:00 2001 From: Christos Zoulas Date: Fri, 25 Apr 2008 14:58:57 +0000 Subject: [PATCH] more debian patches from abelcheung --- magic/Magdir/animation | 38 +++++++++++++++++++++++--------------- magic/Magdir/filesystems | 15 +++++++++++++++ magic/Magdir/fsav | 2 -- magic/Magdir/linux | 7 +++++++ 4 files changed, 45 insertions(+), 17 deletions(-) diff --git a/magic/Magdir/animation b/magic/Magdir/animation index 313075c3..c5da229c 100644 --- a/magic/Magdir/animation +++ b/magic/Magdir/animation @@ -276,7 +276,7 @@ # modified by Joerg Jenderek # GRR the original test are too common for many DOS files # so don't accept as MP3 until we've tested the rate -0 beshort&0xFFFE +0 beshort&0xFFFE 0xFFFA # rates >2 byte&0xF0 0x10 MPEG ADTS, layer III, v1, 32 kbps !:mime audio/mpeg @@ -617,22 +617,30 @@ #0 beshort 0x4DE1 MPEG-4 LO-EP audio stream #!:mime audio/x-mp4a-latm -# FLI animation format -4 leshort 0xAF11 FLI file +# Summary: FLI animation format +# Created by: Daniel Quinlan +# Modified by (1): Abel Cheung (avoid over-generic detection) +4 leshort 0xAF11 +# standard FLI always has 320x200 resolution and 8 bit color +>8 leshort 320 +>>10 leshort 200 +>>>12 leshort 8 FLI animation, 320x200x8 !:mime video/x-fli ->6 leshort x - %d frames, ->8 leshort x width=%d pixels, ->10 leshort x height=%d pixels, ->12 leshort x depth=%d, ->16 leshort x ticks/frame=%d -# FLC animation format -4 leshort 0xAF12 FLC file +>>>>6 leshort x \b, %d frames +# frame speed is multiple of 1/70s +>>>>16 leshort x \b, %d/70s per frame + +# Summary: FLC animation format +# Created by: Daniel Quinlan +# Modified by (1): Abel Cheung (avoid over-generic detection) +4 leshort 0xAF12 +# standard FLC always use 8 bit color +>12 leshort 8 FLC animation !:mime video/x-flc ->6 leshort x - %d frames ->8 leshort x width=%d pixels, ->10 leshort x height=%d pixels, ->12 leshort x depth=%d, ->16 leshort x ticks/frame=%d +>>8 leshort x \b, %d +>>10 leshort x \bx%dx8 +>>6 uleshort x \b, %d frames +>>16 uleshort x \b, %dms per frame # DL animation format # XXX - collision with most `mips' magic diff --git a/magic/Magdir/filesystems b/magic/Magdir/filesystems index 044d81e8..24ceaaad 100644 --- a/magic/Magdir/filesystems +++ b/magic/Magdir/filesystems @@ -1266,6 +1266,21 @@ >>>2 short 2048 AXP generated) >>>2 short 4096 I64 generated) +# Summary: Oracle Clustered Filesystem +# Created by: Aaron Botsis +8 string OracleCFS Oracle Clustered Filesystem, +>4 long x rev %d +>0 long x \b.%d, +>560 string x label: %.64s, +>136 string x mountpoint: %.128s + +# Summary: Oracle ASM tagged volume +# Created by: Aaron Botsis +32 string ORCLDISK Oracle ASM Volume, +>40 string x Disk Name: %0.12s +32 string ORCLCLRD Oracle ASM Volume (cleared), +>40 string x Disk Name: %0.12s + # Compaq/HP RILOE floppy image # From: Dirk Jagdmann 0 string CPQRFBLO Compaq/HP RILOE floppy image diff --git a/magic/Magdir/fsav b/magic/Magdir/fsav index 5f6d0e6f..ccc6d596 100644 --- a/magic/Magdir/fsav +++ b/magic/Magdir/fsav @@ -54,8 +54,6 @@ >>>>>>>>37 string x \b%-.1s >>>>>>>>>38 string !: >>>>>>>>>>38 string x \b%-.1s ->>>>512 string \037\213 \b, gzipped ->>>>769 string ustar\0 \b, tarred >512 string \037\213 \b, gzipped >769 string ustar\0 \b, tarred diff --git a/magic/Magdir/linux b/magic/Magdir/linux index 393f79cf..1234d783 100644 --- a/magic/Magdir/linux +++ b/magic/Magdir/linux @@ -247,3 +247,10 @@ >72 string x %s] >168 string x UUID: %s + +# Summary: Xen saved domain file +# Created by: Radek Vokal +0 string LinuxGuestRecord Xen saved domain +>20 search/256 (name +>>&1 string x (name %s) + -- 2.40.0