libextractor

commit 59780b57736385685d2f8e61b8e9f626b1755761
parent 6173b309c8b93ef1c41ec943cf0a18d7a4ee562c
Author: Heikki Lindholm <holin@iki.fi>
Date:   Mon, 21 Jul 2008 13:49:23 +0000

ffmpeg: enable ppm decoder


Diffstat:
M
configure.ac
 | 
4
+++-
M
src/plugins/thumbnailffmpeg/thumbnailextractorffmpeg.c
 | 
1
+
M
src/test/fuzz_thumbnail.sh
 | 
2
+-

3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
@@ -571,9 +571,11 @@ then
 	--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
diff --git a/src/plugins/thumbnailffmpeg/thumbnailextractorffmpeg.c b/src/plugins/thumbnailffmpeg/thumbnailextractorffmpeg.c
@@ -139,6 +139,7 @@ static const struct MimeToDecoderMapping m2d_map[] = {
   {"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}
 };
 
diff --git a/src/test/fuzz_thumbnail.sh b/src/test/fuzz_thumbnail.sh
@@ -15,7 +15,7 @@ then
 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