summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--freedesktop.org.xml.in5
-rw-r--r--tests/list5
-rw-r--r--tests/test.avibin0 -> 71692 bytes
-rw-r--r--tests/test.wavbin0 -> 88244 bytes
5 files changed, 17 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 23162cb7..336f55ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2008-04-10 Bastien Nocera <hadess@hadess.net>
+ * freedesktop.org.xml.in: Require AVI files to have both the RIFF
+ and the "AVI " bits, not just one of them (Closes: #12541)
+
+ * tests/list:
+ * tests/test.avi:
+ * tests/test.wav: Add WAVE and AVI test files
+
+2008-04-10 Bastien Nocera <hadess@hadess.net>
+
* freedesktop.org.xml.in: Add magic for KDC Kodak raw image files
* tests/list:
* tests/test.kdc: Add test case for that image file
diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in
index 41718fba..bf53b497 100644
--- a/freedesktop.org.xml.in
+++ b/freedesktop.org.xml.in
@@ -4255,8 +4255,9 @@ command to generate the output files.
<acronym>AVI</acronym>
<expanded-acronym>Audio Video Interleave</expanded-acronym>
<magic priority="50">
- <match type="string" value="AVI " offset="8"/>
- <match type="string" value="RIFF" offset="0"/>
+ <match type="string" value="RIFF" offset="0">
+ <match type="string" value="AVI " offset="8"/>
+ </match>
</magic>
<glob pattern="*.avi"/>
<glob pattern="*.divx"/>
diff --git a/tests/list b/tests/list
index 9bea94aa..ba5f9d9d 100644
--- a/tests/list
+++ b/tests/list
@@ -99,6 +99,11 @@ test.alz application/x-alz
# Copied from /usr/share/gettext/javaversion.class
test.class application/x-java
+# Audio/Video files
+# Copied from /usr/share/sounds/generic.wav
+test.wav audio/x-wav
+test.avi video/x-msvideo
+
# other
text.pdf application/pdf
README.pdf application/pdf
diff --git a/tests/test.avi b/tests/test.avi
new file mode 100644
index 00000000..7d66ff20
--- /dev/null
+++ b/tests/test.avi
Binary files differ
diff --git a/tests/test.wav b/tests/test.wav
new file mode 100644
index 00000000..d38385fc
--- /dev/null
+++ b/tests/test.wav
Binary files differ