[SCM] audacity/master: Add missing include to support building Audacity with libav 0.8.

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 8fece12465ad9edd8b3101c4c94c3d6c5c631a9e
Author: Benjamin Drung <bdrung at debian.org>
Date:   Sat Jan 14 13:02:27 2012 +0100

    Add missing include to support building Audacity with libav 0.8.
    
    Closes: #654212

diff --git a/debian/patches/disable-dynamic-ffmpeg.patch b/debian/patches/disable-dynamic-ffmpeg.patch
index 4f597a4..4c7f104 100644
--- a/debian/patches/disable-dynamic-ffmpeg.patch
+++ b/debian/patches/disable-dynamic-ffmpeg.patch
@@ -77,9 +77,9 @@ Bug: http://bugzilla.audacityteam.org/show_bug.cgi?id=233
  }
 --- a/src/FFmpeg.h
 +++ b/src/FFmpeg.h
-@@ -40,6 +40,19 @@
-    #include <libavformat/avformat.h>
+@@ -41,6 +41,19 @@
     #include <libavutil/fifo.h>
+    #include <libavutil/mathematics.h>
  
 +   #define avio_read get_buffer
 +   #define avio_seek url_fseek
@@ -97,7 +97,7 @@ Bug: http://bugzilla.audacityteam.org/show_bug.cgi?id=233
     #if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(52, 102, 0)
     #define AVIOContext ByteIOContext
     #endif
-@@ -350,6 +363,7 @@
+@@ -351,6 +364,7 @@
  } streamContext;
  #endif
  
@@ -105,7 +105,7 @@ Bug: http://bugzilla.audacityteam.org/show_bug.cgi?id=233
  extern "C" {
     // A little explanation of what's going on here.
     //
-@@ -882,6 +896,7 @@
+@@ -883,6 +897,7 @@
        (protocol, size)
     );
  };
diff --git a/debian/patches/libav0.8.patch b/debian/patches/libav0.8.patch
new file mode 100644
index 0000000..968c953
--- /dev/null
+++ b/debian/patches/libav0.8.patch
@@ -0,0 +1,13 @@
+Description: Add missing include to support building Audacity with libav 0.8.
+Bug-Debian: http://bugs.debian.org/654212
+
+--- a/src/FFmpeg.h
++++ b/src/FFmpeg.h
+@@ -39,6 +39,7 @@
+    #include <libavcodec/avcodec.h>
+    #include <libavformat/avformat.h>
+    #include <libavutil/fifo.h>
++   #include <libavutil/mathematics.h>
+ 
+    #if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(52, 102, 0)
+    #define AVIOContext ByteIOContext
diff --git a/debian/patches/series b/debian/patches/series
index 2289ec2..352b9eb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 upstream-ffmpeg-2.patch
+libav0.8.patch
 disable-dynamic-ffmpeg.patch
 disable-dynamic-lame.patch

-- 
Audacity debian packaging