[SCM] libav/master: Disable configuration mismatch warnings

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Thu Jan 5 21:15:07 UTC 2012


The following commit has been merged in the master branch:
commit f1255e65c0b84412f54a18fa1587e4fac6c8d506
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Jan 5 22:14:10 2012 +0100

    Disable configuration mismatch warnings
    
    Closes: #619530, LP: #765357

diff --git a/debian/patches/03-disable-configuration-warnings.patch b/debian/patches/03-disable-configuration-warnings.patch
new file mode 100644
index 0000000..b745908
--- /dev/null
+++ b/debian/patches/03-disable-configuration-warnings.patch
@@ -0,0 +1,21 @@
+Author: Reinhard Tartler <siretart at tauware.de>
+Description: Disable configuration output warnings
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=619530
+Bug-Ubuntu: https://launchpad.net/bugs/765357
+Forwarded: not-needed
+
+diff --git a/cmdutils.c b/cmdutils.c
+index c5c2c1c..118b152 100644
+--- a/cmdutils.c
++++ b/cmdutils.c
+@@ -443,7 +443,9 @@ void print_error(const char *filename, int err)
+     av_log(NULL, AV_LOG_ERROR, "%s: %s\n", filename, errbuf_ptr);
+ }
+ 
+-static int warned_cfg = 0;
++// Debian/Ubuntu: see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=619530
++//                    https://launchpad.net/bugs/765357
++static int warned_cfg = 1;
+ 
+ #define INDENT        1
+ #define SHOW_VERSION  2
diff --git a/debian/patches/series b/debian/patches/series
index 6f57bbd..01878d5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01-Tweak-doxygen-config.patch
 02-swscale-fix-crash-in-fast_bilinear-code-when-compile.patch
+03-disable-configuration-warnings.patch

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list