[bug-libextractor] v1.1 build fails against ffmpeg 2.0.1

[Brandon Invergo]

Hi,

I'm trying to update libextractor in the GNU Source Release Collection
but I'm encountering a build error:

libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I../.. -I../../src/include 
-I../../src/co
mmon -pthread -I/home/brandon/gnu/include/gtk-2.0 
-I/home/brandon/gnu/lib/gtk-2.0/inc
lude -I/home/brandon/gnu/include/atk-1.0 -I/home/brandon/gnu/include/glib-2.0 
-I/home
/brandon/gnu/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/cairo 
-I/us
r/include/pixman-1 -I/usr/include/libdrm -I/usr/include/libpng16 
-I/usr/include/gdk-p
ixbuf-2.0 -I/usr/include/libpng16 -I/usr/include/pango-1.0 
-I/usr/include/harfbuzz -I
/usr/include/pango-1.0 -I/usr/include/freetype2 -fno-strict-aliasing -g -O2 
-pthread 
-I/home/brandon/gnu/include/gtk-2.0 -I/home/brandon/gnu/lib/gtk-2.0/include 
-I/home/b
randon/gnu/include/atk-1.0 -I/home/brandon/gnu/include/glib-2.0 
-I/home/brandon/gnu/l
ib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/cairo 
-I/usr/include/pixm
an-1 -I/usr/include/libdrm -I/usr/include/libpng16 
-I/usr/include/gdk-pixbuf-2.0 -I/u
sr/include/libpng16 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz 
-I/usr/include/p
ango-1.0 -I/usr/include/freetype2 -MT thumbnailffmpeg_extractor.lo -MD -MP -MF 
.deps/
thumbnailffmpeg_extractor.Tpo -c thumbnailffmpeg_extractor.c  -fPIC -DPIC -o 
.libs/th
umbnailffmpeg_extractor.o
thumbnailffmpeg_extractor.c: In function 'create_thumbnail':
thumbnailffmpeg_extractor.c:267:3: warning: 'avcodec_encode_video' is 
deprecated (dec
lared at /usr/include/libavcodec/avcodec.h:4137) [-Wdeprecated-declarations]
   err = avcodec_encode_video (encoder_codec_ctx,
   ^
thumbnailffmpeg_extractor.c: At top level:
thumbnailffmpeg_extractor.c:339:23: warning: 'enum CodecID' declared inside 
parameter
 list [enabled by default]
                struct EXTRACTOR_ExtractContext *ec)
                       ^
thumbnailffmpeg_extractor.c:339:23: warning: its scope is only this definition 
or dec
laration, which is probably not what you want [enabled by default]
thumbnailffmpeg_extractor.c:338:29: error: parameter 1 ('image_codec_id') has 
incompl
ete type
 extract_image (enum CodecID image_codec_id,
                             ^
thumbnailffmpeg_extractor.c:634:16: error: field 'codec_id' has incomplete type
   enum CodecID codec_id;
                ^
make[5]: *** [thumbnailffmpeg_extractor.lo] Error 1
make[5]: Leaving directory 
`/home/brandon/Projects/gsrc/trunk/gnu/libextractor/work/l
ibextractor-1.1/src/plugins'
make[4]: *** [all-recursive] Error 1
make[4]: Leaving directory 
`/home/brandon/Projects/gsrc/trunk/gnu/libextractor/work/l
ibextractor-1.1/src/plugins'
make[3]: *** [all-recursive] Error 1
make[3]: Leaving directory 
`/home/brandon/Projects/gsrc/trunk/gnu/libextractor/work/l
ibextractor-1.1/src'
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory 
`/home/brandon/Projects/gsrc/trunk/gnu/libextractor/work/l
ibextractor-1.1'
make[1]: *** [all] Error 2
make[1]: Leaving directory 
`/home/brandon/Projects/gsrc/trunk/gnu/libextractor/work/l
ibextractor-1.1'
[*** build] ==> Build failed. Exiting.
make: *** [build-work/libextractor-1.1/Makefile] Error 1


It looks like this is related to ffmpeg, which I have installed at
version 2.0.1.  

Here's a patch that fixes the errors (CodecID has been renamed to
AVCodecID):

diff -x config.log -x config.status -ru 
work/libextractor-1.1/src/plugins/thumbnailffmpeg_extractor.c 
work/libextractor-1.1/src/plugins/thumbnailffmpeg_extractor.c
--- work/libextractor-1.1/src/plugins/thumbnailffmpeg_extractor.c       
2013-02-02 01:42:26.000000000 +0100
+++ work/libextractor-1.1/src/plugins/thumbnailffmpeg_extractor.c       
2013-08-17 13:03:57.070959253 +0200
@@ -335,7 +335,7 @@
  * @param ec extraction context to use
  */
 static void
-extract_image (enum CodecID image_codec_id,
+extract_image (enum AVCodecID image_codec_id,
                struct EXTRACTOR_ExtractContext *ec)
 {
   AVDictionary *opts;
@@ -631,7 +631,7 @@
   /**
    * Corresponding ffmpeg decoder ID.
    */
-  enum CodecID codec_id;
+  enum AVCodecID codec_id;
 };
 
 

Cheers,
Brandon

-- 
Brandon Invergo
http://brandon.invergo.net

pgpl3AJRdzpnv.pgp
Description: PGP signature