[GNUnet-SVN] r2311 - in Extractor: . src/plugins

[grothoff]

Author: grothoff
Date: 2005-12-04 23:15:51 -0800 (Sun, 04 Dec 2005)
New Revision: 2311

Modified:
   Extractor/ChangeLog
   Extractor/src/plugins/mimeextractor.c
   Extractor/src/plugins/riffextractor.c
Log:
fixing mantis 979

Modified: Extractor/ChangeLog
===================================================================
--- Extractor/ChangeLog 2005-12-05 07:13:54 UTC (rev 2310)
+++ Extractor/ChangeLog 2005-12-05 07:15:51 UTC (rev 2311)
@@ -1,3 +1,6 @@
+Sun Dec  4 23:36:00 PST 2005
+       Fixed AVI mime-type to be video/x-msvideo.
+
 Sat Nov 12 10:50:46 PST 2005
        Releasing libextractor 0.5.7.
        

Modified: Extractor/src/plugins/mimeextractor.c
===================================================================
--- Extractor/src/plugins/mimeextractor.c       2005-12-05 07:13:54 UTC (rev 
2310)
+++ Extractor/src/plugins/mimeextractor.c       2005-12-05 07:15:51 UTC (rev 
2311)
@@ -179,9 +179,9 @@
   { "%PDF", 4, "application/pdf", DEFAULT},
   { "%!PS-Adobe-", 11, "application/postscript", DEFAULT},
   { "\004%!PS-Adobe-", 12, "application/postscript, DEFAULT"}, /* DOS? :-) */
-  { "RIFF", 4, "video/avi", XPATTERN(AVI_XPATTERN)},
+  { "RIFF", 4, "video/x-msvideo", XPATTERN(AVI_XPATTERN)},
   { "RIFF", 4, "audio/x-wav", XPATTERN(WAVE_XPATTERN)},
-  { "RIFX", 4, "video/avi", XPATTERN(AVI_XPATTERN)},
+  { "RIFX", 4, "video/x-msvideo", XPATTERN(AVI_XPATTERN)},
   { "RIFX", 4, "audio/x-wav", XPATTERN(WAVE_XPATTERN)},
   { "RIFF", 4, "audio/midi", XPATTERN(RMID_XPATTERN)},
   { "RIFX", 4, "audio/midi", XPATTERN(RMID_XPATTERN)},

Modified: Extractor/src/plugins/riffextractor.c
===================================================================
--- Extractor/src/plugins/riffextractor.c       2005-12-05 07:13:54 UTC (rev 
2310)
+++ Extractor/src/plugins/riffextractor.c       2005-12-05 07:15:51 UTC (rev 
2311)
@@ -90,7 +90,7 @@
    return floor(num + 0.5);
 }
 
-/* video/avi */
+/* video/x-msvideo */
 struct EXTRACTOR_Keywords * libextractor_riff_extract(char * filename,
                                                      char * xdata,
                                                      size_t xsize,
@@ -181,7 +181,7 @@
             format,
             EXTRACTOR_SIZE);
   addKeyword(&prev,
-            strdup("video/avi"),
+            strdup("video/x-msvideo"),
             EXTRACTOR_MIMETYPE);
   return prev;
 }