[SCM] audacity/master: Refresh disable-dynamic-ffmpeg.patch.

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 7f90cfed83274cdf8452e8a15a8617eddac2c371
Author: Benjamin Drung <bdrung at debian.org>
Date:   Fri Aug 24 11:35:47 2012 +0200

    Refresh disable-dynamic-ffmpeg.patch.

diff --git a/debian/patches/disable-dynamic-ffmpeg.patch b/debian/patches/disable-dynamic-ffmpeg.patch
index f56cf5c..0f8c38d 100644
--- a/debian/patches/disable-dynamic-ffmpeg.patch
+++ b/debian/patches/disable-dynamic-ffmpeg.patch
@@ -4,7 +4,7 @@ Bug: http://bugzilla.audacityteam.org/show_bug.cgi?id=233
 
 --- a/configure.in
 +++ b/configure.in
-@@ -178,6 +178,12 @@
+@@ -180,6 +180,12 @@
  
  AC_ARG_ENABLE(universal_binary,[  --enable-universal_binary enable universal binary build: (default: disable)],[enable_universal_binary=$enableval],[enable_universal_binary=no])
  
@@ -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
-@@ -481,7 +481,7 @@
+@@ -483,7 +483,7 @@
     }
  
     sc->m_samplefmt = sc->m_codecCtx->sample_fmt;
@@ -41,7 +41,7 @@ Bug: http://bugzilla.audacityteam.org/show_bug.cgi?id=233
  
     unsigned int newsize = FFMAX(sc->m_pkt.size * sc->m_samplesize, AVCODEC_MAX_AUDIO_FRAME_SIZE);
     // Reallocate the audio sample buffer if it's smaller than the frame size.
-@@ -751,6 +751,10 @@
+@@ -754,6 +754,10 @@
  
  bool FFmpegLibs::LoadLibs(wxWindow *parent, bool showerr)
  {
@@ -52,7 +52,7 @@ Bug: http://bugzilla.audacityteam.org/show_bug.cgi?id=233
  
     wxLogMessage(wxT("Trying to load FFmpeg libraries..."));
     if (ValidLibsLoaded()) {
-@@ -834,6 +838,7 @@
+@@ -837,6 +841,7 @@
  
  bool FFmpegLibs::InitLibs(wxString libpath_format, bool showerr)
  {
@@ -60,18 +60,18 @@ Bug: http://bugzilla.audacityteam.org/show_bug.cgi?id=233
     FreeLibs();
  
  #if defined(__WXMSW__)
-@@ -1026,9 +1031,7 @@
+@@ -1029,9 +1034,8 @@
     FFMPEG_INITDYN(avcodec, avcodec_version);
     FFMPEG_INITDYN(avcodec, av_fast_realloc);
     FFMPEG_INITDYN(avcodec, av_codec_next);
 -   FFMPEG_INITDYN(avcodec, av_get_bits_per_sample_format);
--
+ 
 -   FFMPEG_INITALT(avcodec, av_get_bits_per_sample_fmt, av_get_bits_per_sample_format);
 +   FFMPEG_INITALT(avcodec, av_get_bits_per_sample_format, av_get_bits_per_sample_fmt);
  
     FFMPEG_INITDYN(avutil, av_free);
     FFMPEG_INITDYN(avutil, av_log_set_callback);
-@@ -1048,8 +1051,10 @@
+@@ -1051,8 +1055,10 @@
     FFMPEG_INITDYN(avutil, av_rescale_q);
     FFMPEG_INITDYN(avutil, avutil_version);
  
@@ -83,11 +83,11 @@ Bug: http://bugzilla.audacityteam.org/show_bug.cgi?id=233
     avcodec_init();
     avcodec_register_all();
     av_register_all();
-@@ -1088,7 +1093,11 @@
+@@ -1091,7 +1097,11 @@
        return false;
     }
  
-+#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(52, 69, 0)
++#if defined(DISABLE_DYNAMIC_LOADING_FFMPEG) && (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(52, 69, 0))
 +   av_register_protocol(&ufile_protocol);
 +#else
     av_register_protocol2(&ufile_protocol, sizeof(ufile_protocol));
@@ -97,10 +97,14 @@ Bug: http://bugzilla.audacityteam.org/show_bug.cgi?id=233
  }
 --- a/src/FFmpeg.h
 +++ b/src/FFmpeg.h
-@@ -41,6 +41,14 @@
-    #include <libavutil/fifo.h>
-    #include <libavutil/mathematics.h>
+@@ -368,6 +368,18 @@
+ 
+ int import_ffmpeg_decode_frame(streamContext *sc, bool flushing);
  
++#if defined(DISABLE_DYNAMIC_LOADING_FFMPEG)
++   // Use the preprocessor to rename old function names instead of checking the
++   // function names with FFMPEG_INITALT when loading the library.
++
 +   #if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(52, 60, 0)
 +   #define av_match_ext match_ext
 +   #endif
@@ -108,19 +112,11 @@ Bug: http://bugzilla.audacityteam.org/show_bug.cgi?id=233
 +   #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
-@@ -367,6 +375,7 @@
- 
- int import_ffmpeg_decode_frame(streamContext *sc, bool flushing);
- 
-+#if !defined(DISABLE_DYNAMIC_LOADING_FFMPEG)
++#else
  extern "C" {
     // A little explanation of what's going on here.
     //
-@@ -899,6 +908,7 @@
+@@ -900,6 +912,7 @@
        (protocol, size)
     );
  };
@@ -130,15 +126,15 @@ Bug: http://bugzilla.audacityteam.org/show_bug.cgi?id=233
  #endif // __AUDACITY_FFMPEG__
 --- a/src/configtemplate.h
 +++ b/src/configtemplate.h
-@@ -84,6 +84,9 @@
-    */
- #undef USE_FFMPEG
+@@ -87,6 +87,9 @@
+ /* Use system LAME library and disable dynamic loading of it. */
+ #undef DISABLE_DYNAMIC_LOADING_LAME
  
 +/* Use system FFmpeg library and disable dynamic loading of it. */
 +#undef DISABLE_DYNAMIC_LOADING_FFMPEG
 +
- /* Use system LAME library and disable dynamic loading of it. */
- #undef DISABLE_DYNAMIC_LOADING_LAME
+ /* Define if LADSPA plug-ins are enabled */
+ #undef USE_LADSPA
  
 --- a/src/prefs/LibraryPrefs.cpp
 +++ b/src/prefs/LibraryPrefs.cpp

-- 
Audacity debian packaging