[GNUnet-SVN] r9895 - Extractor/src/plugins

[gnunet]

Author: holindho
Date: 2009-12-25 08:14:55 +0100 (Fri, 25 Dec 2009)
New Revision: 9895

Modified:
   Extractor/src/plugins/thumbnailffmpeg_extractor.c
Log:
catch ffmpegs logging


Modified: Extractor/src/plugins/thumbnailffmpeg_extractor.c
===================================================================
--- Extractor/src/plugins/thumbnailffmpeg_extractor.c   2009-12-24 20:56:54 UTC 
(rev 9894)
+++ Extractor/src/plugins/thumbnailffmpeg_extractor.c   2009-12-25 07:14:55 UTC 
(rev 9895)
@@ -44,27 +44,25 @@
 
 #define DEBUG 0
 
+static void thumbnailffmpeg_av_log_callback(void* ptr, 
+                                            int level,
+                                            const char *format,
+                                            va_list ap)
+{
+#if DEBUG
+  vfprintf(stderr, format, ap);
+#endif
+}
+
 void __attribute__ ((constructor)) ffmpeg_lib_init (void)
 {
+  av_log_set_callback (thumbnailffmpeg_av_log_callback);
   av_register_all ();
 }
 
 #define THUMBSIZE 128           /* max dimension in pixels */
 #define MAX_THUMB_SIZE (100*1024)       /* in bytes */
 
-
-const char *
-EXTRACTOR_thumbnailffmpeg_options ()
-{
-  return "close-stderr";
-}
-
-const char *
-EXTRACTOR_thumbnail_options ()
-{
-  return "close-stderr";
-}
-
 /*
  * Rescale and encode a png thumbnail
  * on success, fills in output_data and returns the number of bytes used