summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2007-08-31 18:24:08 +0000
committerBastien Nocera <hadess@hadess.net>2007-08-31 18:24:08 +0000
commitdae00a8db77f57ff4329fb31b6ded885dbd503c8 (patch)
tree5bc55b60448048bb4848eb8bd8da406fe710e479
parent7e460b7294c3f2557acdafd0b44dbea382d2058c (diff)
downloadshared-mime-info-dae00a8db77f57ff4329fb31b6ded885dbd503c8.tar.gz
2007-08-31 Bastien Nocera <hadess@hadess.net>
* freedesktop.org.xml.in: Fix JPEG-2000 mime-types and magic to follow the RFC (Closes: #11942) * tests/list: s,image/jpeg2000,image/jp2
-rw-r--r--ChangeLog6
-rw-r--r--freedesktop.org.xml.in4
-rw-r--r--tests/list4
3 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 4000fe7e..c9df3f7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2007-08-31 Bastien Nocera <hadess@hadess.net>
+ * freedesktop.org.xml.in: Fix JPEG-2000 mime-types and magic to
+ follow the RFC (Closes: #11942)
+ * tests/list: s,image/jpeg2000,image/jp2
+
+2007-08-31 Bastien Nocera <hadess@hadess.net>
+
* freedesktop.org.xml.in: Add *.vlc as a pattern for m3u files,
as used by VideoLAN (Closes: #12114)
diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in
index 7fdd599e..d8feae44 100644
--- a/freedesktop.org.xml.in
+++ b/freedesktop.org.xml.in
@@ -2634,14 +2634,16 @@ command to generate the output files.
<glob pattern="*.jpe"/>
<alias type="image/pjpeg"/>
</mime-type>
- <mime-type type="image/jpeg2000">
+ <mime-type type="image/jp2">
<_comment>JPEG-2000 image</_comment>
<magic priority="50">
<match value="jP" type="string" offset="4" />
<match value="\xFF\x4F\xFF\x51\x00" type="string" offset="0" />
+ <match type="big32" value="0x0c6a5020" offset="3"/>
</magic>
<glob pattern="*.jp2"/>
<glob pattern="*.jpc"/>
+ <alias type="image/jpeg2000"/>
</mime-type>
<mime-type type="image/x-dds">
<_comment>DirectDraw surface</_comment>
diff --git a/tests/list b/tests/list
index 7a5f9a11..10008078 100644
--- a/tests/list
+++ b/tests/list
@@ -8,9 +8,9 @@ test.fli video/x-flic ox
test.gif image/gif
test.ico image/x-ico ox
test.im1 image/x-sun-raster x
-test.jp2 image/jpeg2000
+test.jp2 image/jp2
test.jpg image/jpeg
-test.jpc image/jpeg2000
+test.jpc image/jp2
test.mng video/x-mng ox
test.pat image/x-pat xxx
test.pcx image/x-pcx x