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

[gnunet]

Author: grothoff
Date: 2013-08-18 21:29:48 +0200 (Sun, 18 Aug 2013)
New Revision: 28692

Modified:
   Extractor/src/plugins/thumbnailffmpeg_extractor.c
Log:
-fix build with libavcodec >= 54-25.0, see 
http://ffmpeg.org/pipermail/ffmpeg-cvslog/2012-August/053368.html

Modified: Extractor/src/plugins/thumbnailffmpeg_extractor.c
===================================================================
--- Extractor/src/plugins/thumbnailffmpeg_extractor.c   2013-08-18 10:04:45 UTC 
(rev 28691)
+++ Extractor/src/plugins/thumbnailffmpeg_extractor.c   2013-08-18 19:29:48 UTC 
(rev 28692)
@@ -327,7 +327,13 @@
 #endif
 }
 
+#if AV_VERSION_INT(54,25,0) > LIBAVUTIL_VERSION_INT
+#define ENUM_CODEC_ID enum CodecID
+#else
+#define ENUM_CODEC_ID enum AvCodecID
+#endif
 
+
 /**
  * Perform thumbnailing when the input is an image.
  *
@@ -335,7 +341,7 @@
  * @param ec extraction context to use
  */
 static void
-extract_image (enum CodecID image_codec_id,
+extract_image (ENUM_CODEC_ID image_codec_id,
                struct EXTRACTOR_ExtractContext *ec)
 {
   AVDictionary *opts;
@@ -631,7 +637,7 @@
   /**
    * Corresponding ffmpeg decoder ID.
    */
-  enum CodecID codec_id;
+  ENUM_CODEC_ID codec_id;
 };