[SCM] audacity/master: Refresh patches.

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c61476630e08f5ec0d4777ec845a71f2f33ba6f8
Author: Benjamin Drung <bdrung at debian.org>
Date:   Thu Dec 22 23:19:15 2011 +0100

    Refresh patches.

diff --git a/debian/patches/disable-dynamic-ffmpeg.patch b/debian/patches/disable-dynamic-ffmpeg.patch
index c2d9806..4f597a4 100644
--- a/debian/patches/disable-dynamic-ffmpeg.patch
+++ b/debian/patches/disable-dynamic-ffmpeg.patch
@@ -32,7 +32,7 @@ Bug: http://bugzilla.audacityteam.org/show_bug.cgi?id=233
        FFMPEG_SYSTEM_OPTOBJS="import/ImportFFmpeg.o export/ExportFFmpeg.o \
 --- a/src/FFmpeg.cpp
 +++ b/src/FFmpeg.cpp
-@@ -611,6 +611,10 @@
+@@ -621,6 +621,10 @@
  
  bool FFmpegLibs::LoadLibs(wxWindow *parent, bool showerr)
  {
@@ -43,7 +43,7 @@ Bug: http://bugzilla.audacityteam.org/show_bug.cgi?id=233
  
     wxLogMessage(wxT("Trying to load FFmpeg libraries..."));
     if (ValidLibsLoaded()) {
-@@ -681,6 +685,7 @@
+@@ -691,6 +695,7 @@
  
  bool FFmpegLibs::InitLibs(wxString libpath_format, bool showerr)
  {
@@ -51,9 +51,9 @@ Bug: http://bugzilla.audacityteam.org/show_bug.cgi?id=233
     FreeLibs();
  
  #if defined(__WXMSW__)
-@@ -881,8 +886,10 @@
-    FFMPEG_INITDYN(util, av_rescale_q);
-    FFMPEG_INITDYN(util, avutil_version);
+@@ -905,8 +910,10 @@
+    FFMPEG_INITDYN(avutil, av_rescale_q);
+    FFMPEG_INITDYN(avutil, avutil_version);
  
 -   //FFmpeg initialization
     wxLogMessage(wxT("All symbols loaded successfully. Initializing the library."));
@@ -63,7 +63,7 @@ Bug: http://bugzilla.audacityteam.org/show_bug.cgi?id=233
     avcodec_init();
     avcodec_register_all();
     av_register_all();
-@@ -921,7 +928,11 @@
+@@ -945,7 +952,11 @@
        return false;
     }
  
@@ -77,27 +77,27 @@ Bug: http://bugzilla.audacityteam.org/show_bug.cgi?id=233
  }
 --- a/src/FFmpeg.h
 +++ b/src/FFmpeg.h
-@@ -47,6 +47,19 @@
-    #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52, 94, 1)
-    #define AVSampleFormat SampleFormat
-    #endif
-+
-+   #if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(52, 64, 0)
-+   #define av_guess_format guess_format
-+   #endif
+@@ -40,6 +40,19 @@
+    #include <libavformat/avformat.h>
+    #include <libavutil/fifo.h>
+ 
++   #define avio_read get_buffer
++   #define avio_seek url_fseek
++   #define avio_close url_fclose
++   #define av_get_bits_per_sample_fmt av_get_bits_per_sample_format
 +
 +   #if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(52, 60, 0)
 +   #define av_match_ext match_ext
 +   #endif
 +
-+   #define avio_read get_buffer
-+   #define avio_seek url_fseek
-+   #define avio_close url_fclose
-+   #define av_get_bits_per_sample_fmt av_get_bits_per_sample_format
- }
- #endif
- 
-@@ -335,6 +348,7 @@
++   #if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(52, 64, 0)
++   #define av_guess_format guess_format
++   #endif
++
+    #if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(52, 102, 0)
+    #define AVIOContext ByteIOContext
+    #endif
+@@ -350,6 +363,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.
     //
-@@ -827,6 +841,7 @@
+@@ -882,6 +896,7 @@
        (protocol, size)
     );
  };
diff --git a/debian/patches/disable-dynamic-lame.patch b/debian/patches/disable-dynamic-lame.patch
index aebbafd..19bb80e 100644
--- a/debian/patches/disable-dynamic-lame.patch
+++ b/debian/patches/disable-dynamic-lame.patch
@@ -367,7 +367,7 @@ Author: Benjamin Drung <bdrung at debian.org>
     }
 --- a/src/prefs/PrefsDialog.cpp
 +++ b/src/prefs/PrefsDialog.cpp
-@@ -101,7 +101,9 @@
+@@ -131,7 +131,9 @@
           w = new ImportExportPrefs(mCategories);mCategories->AddPage(w, w->GetName(), false, 0);
           w = new ExtImportPrefs(mCategories);   mCategories->AddPage(w, w->GetName(), false, 0);
           w = new ProjectsPrefs(mCategories);    mCategories->AddPage(w, w->GetName(), false, 0);

-- 
Audacity debian packaging