[SCM] bs1770gain/master: Remove obsolete 12-ffmpeg-av-lib.diff.

[pere at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 498d6fb6443fb069851a4ee15edfc65adc67415c
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Wed Jun 3 09:46:16 2015 +0000

    Remove obsolete 12-ffmpeg-av-lib.diff.

diff --git a/debian/patches/12-ffmpeg-av-lib.diff b/debian/patches/12-ffmpeg-av-lib.diff
deleted file mode 100644
index 478235f..0000000
--- a/debian/patches/12-ffmpeg-av-lib.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-Description: Change the dynamic library loading to use the ffmpeg based libraries, as
- the others do not seem to work with bs1770gain (missing symbols).
-Forwarded: not-needed
-Author: Petter Reinholdtsen <pere at hungry.com>
-Last-Update: 2015-06-01
-
-diff --git a/libffsox-2/ffsox_dynload.c b/libffsox-2/ffsox_dynload.c
-index 6d375be..5665a83 100644
---- a/libffsox-2/ffsox_dynload.c
-+++ b/libffsox-2/ffsox_dynload.c
-@@ -142,10 +142,10 @@ found:
-   return hLib;
- }
- #else // } {
--#define FFSOX_AVUTIL "libavutil.so." FFSOX_AVUTIL_V
--#define FFSOX_SWRESAMPLE "libswresample.so." FFSOX_SWRESAMPLE_V
--#define FFSOX_AVCODEC "libavcodec.so." FFSOX_AVCODEC_V
--#define FFSOX_AVFORMAT "libavformat.so." FFSOX_AVFORMAT_V
-+#define FFSOX_AVUTIL "libavutil-ffmpeg.so." FFSOX_AVUTIL_V
-+#define FFSOX_SWRESAMPLE "libswresample-ffmpeg.so." FFSOX_SWRESAMPLE_V
-+#define FFSOX_AVCODEC "libavcodec-ffmpeg.so." FFSOX_AVCODEC_V
-+#define FFSOX_AVFORMAT "libavformat-ffmpeg.so." FFSOX_AVFORMAT_V
- 
- #define FFSOX_LIBSOX "libsox.so." FFSOX_LIBSOX_V
- 
-@@ -219,6 +219,9 @@ static void *ffsox_loadlib(const char *root, const char *dirname,
-   if (NULL!=(lib=ffsox_loadlib_try("/usr/lib",NULL,basename)))
-     goto found;
- 
-+  if (NULL!=(lib=ffsox_loadlib_try("/usr/lib/x86_64-linux-gnu",NULL,basename)))
-+    goto found;
-+
-   if (NULL!=(path=getenv("LD_LIBRARY_PATH"))) {
-     if (NULL==(path=strdup(path)))
-       goto path;
diff --git a/debian/patches/series b/debian/patches/series
index fcf3658..81973e0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,6 @@
 01-libpbutil.diff
 10-remove-makefile.diff
 11-autotools.diff
-12-ffmpeg-av-lib.diff
 20-memleak-album.diff
 21-accesss-freed-mem.diff
 22-disable-dynload.diff

-- 
bs1770gain packaging