Bug#591516: FTBFS with ffmpeg 0.6

[Reinhard Tartler]

Package: avbin
Version: 7-1
Severity: important
Tags: patch

Your package FTBFS with FFmpeg 0.6 as found in experimental:

avbin.c: In function 'avbin_log_callback':
avbin.c:59: error: 'av_log_level' undeclared (first use in this function)
avbin.c:59: error: (Each undeclared identifier is reported only once
avbin.c:59: error: for each function it appears in.)
avbin.c: In function 'avbin_set_log_level':
avbin.c:101: error: 'av_log_level' undeclared (first use in this function)
avbin.c: In function 'avbin_decode_audio':
avbin.c:302: warning: 'avcodec_decode_audio2' is deprecated (declared at /usr/include/libavcodec/avcodec.h:3390)
avbin.c: In function 'avbin_decode_video':
avbin.c:325: warning: 'avcodec_decode_video' is deprecated (declared at /usr/include/libavcodec/avcodec.h:3452)
avbin.c:351: warning: passing argument 2 of 'sws_scale' from incompatible pointer type
/usr/include/libswscale/swscale.h:195: note: expected 'const uint8_t * const*' but argument is of type 'uint8_t **'
make[3]: *** [libavbin_la-avbin.lo] Error 1
make[3]: Leaving directory `/build/buildd-avbin_7-1-amd64-1FqBDC/avbin-7/src'
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory `/build/buildd-avbin_7-1-amd64-1FqBDC/avbin-7'
make[1]: *** [all] Error 2
make[1]: Leaving directory `/build/buildd-avbin_7-1-amd64-1FqBDC/avbin-7'
dh_auto_build: make -j1 returned exit code 2
make: *** [build] Error 2

this patch fixes it:

>> debdiff avbin_7-1.dsc avbin_7-1.1.dsc 
diff -u avbin-7/debian/changelog avbin-7/debian/changelog
--- avbin-7/debian/changelog
+++ avbin-7/debian/changelog
@@ -1,3 +1,10 @@
+avbin (7-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * port to new libavutil50 log API.
+
+ -- Reinhard Tartler <siretart at tauware.de>  Tue, 03 Aug 2010 17:58:35 +0000
+
 avbin (7-1) unstable; urgency=low
 
   [ Andrew Straw ]
diff -u avbin-7/src/avbin.c avbin-7/src/avbin.c
--- avbin-7/src/avbin.c
+++ avbin-7/src/avbin.c
@@ -43,6 +43,7 @@
 };
 
 static AVbinLogCallback user_log_callback = NULL;
+static int av_log_level;
 
 /**
  * Format log messages and call the user log callback.  Essentially a
@@ -92,7 +93,8 @@
 AVbinResult avbin_init()
 {
     avcodec_init();
-    av_register_all();    
+    av_register_all();
+    av_log_level = av_log_get_level();
     return AVBIN_RESULT_OK;
 }


take care!


-- System Information:
Debian Release: squeeze/sid
  APT prefers lucid-updates
  APT policy: (500, 'lucid-updates'), (500, 'lucid-security'), (500, 'lucid-proposed'), (500, 'lucid')
Architecture: i386 (i686)

Kernel: Linux 2.6.32-24-generic (SMP w/2 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash