[GNUnet-SVN] r7500 - in Extractor: . src/plugins/thumbnailffmpeg src/test

[gnunet]

Author: holindho
Date: 2008-07-21 07:49:23 -0600 (Mon, 21 Jul 2008)
New Revision: 7500

Modified:
   Extractor/configure.ac
   Extractor/src/plugins/thumbnailffmpeg/thumbnailextractorffmpeg.c
   Extractor/src/test/fuzz_thumbnail.sh
Log:
ffmpeg: enable ppm decoder


Modified: Extractor/configure.ac
===================================================================
--- Extractor/configure.ac      2008-07-21 13:01:00 UTC (rev 7499)
+++ Extractor/configure.ac      2008-07-21 13:49:23 UTC (rev 7500)
@@ -571,9 +571,11 @@
        --disable-encoders              \
        --disable-decoders              \
        --enable-encoder=png            \
+       --enable-encoder=ppm            \
        --enable-decoder=bmp            \
        --enable-decoder=gif            \
-       --enable-decoder=png
+       --enable-decoder=png            \
+       --enable-parser=pnm
   then
     AC_MSG_ERROR([FFmpeg configure failed.])
   fi

Modified: Extractor/src/plugins/thumbnailffmpeg/thumbnailextractorffmpeg.c
===================================================================
--- Extractor/src/plugins/thumbnailffmpeg/thumbnailextractorffmpeg.c    
2008-07-21 13:01:00 UTC (rev 7499)
+++ Extractor/src/plugins/thumbnailffmpeg/thumbnailextractorffmpeg.c    
2008-07-21 13:49:23 UTC (rev 7500)
@@ -139,6 +139,7 @@
   {"image/gif", CODEC_ID_GIF},
   {"image/jpeg", CODEC_ID_MJPEG},
   {"image/png", CODEC_ID_PNG},
+  {"image/x-portable-pixmap", CODEC_ID_PPM},
   {NULL, CODEC_ID_NONE}
 };
 

Modified: Extractor/src/test/fuzz_thumbnail.sh
===================================================================
--- Extractor/src/test/fuzz_thumbnail.sh        2008-07-21 13:01:00 UTC (rev 
7499)
+++ Extractor/src/test/fuzz_thumbnail.sh        2008-07-21 13:49:23 UTC (rev 
7500)
@@ -15,7 +15,7 @@
 fi
 
 
-for file in $testdatadir/*.bmp $testdatadir/*.gif $testdatadir/*.png
+for file in $testdatadir/*.bmp $testdatadir/*.gif $testdatadir/*.png 
$testdatadir/*.ppm
 do
   if test -f "$file"
   then