[SCM] transcode/master: Remove 02_toolame.diff, applied upstream.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Sat Mar 3 12:07:19 UTC 2012
The following commit has been merged in the master branch:
commit 48f5df9e6f2d10e13206ea23b52b092a63e106f1
Author: Alessio Treglia <alessio at debian.org>
Date: Tue Feb 21 12:03:03 2012 +0100
Remove 02_toolame.diff, applied upstream.
diff --git a/debian/patches/02_toolame.diff b/debian/patches/02_toolame.diff
deleted file mode 100644
index 944beb5..0000000
--- a/debian/patches/02_toolame.diff
+++ /dev/null
@@ -1,51 +0,0 @@
-Description: Make a new export module for twolame now that toolame is gone in Debian.
-Origin: Ubuntu
-Forwarded: Francesco Romani <fromani at gmail.com>
----
- export/export_toolame.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
---- transcode.orig/export/export_toolame.c
-+++ transcode/export/export_toolame.c
-@@ -24,7 +24,7 @@
- *
- */
-
--#define MOD_NAME "export_toolame.so"
-+#define MOD_NAME "export_twolame.so"
- #define MOD_VERSION "v1.0.6 (2004-01-26)"
- #define MOD_CODEC "(audio) MPEG 1/2"
-
-@@ -39,7 +39,7 @@
- static int verbose_flag = TC_QUIET;
- static int capability_flag = TC_CAP_PCM;
-
--#define MOD_PRE toolame
-+#define MOD_PRE twolame
- #include "export_def.h"
-
- static FILE* pFile = NULL;
-@@ -85,8 +85,8 @@ MOD_open
- char chan;
- char *ptr;
-
-- /* check for toolame */
-- if (tc_test_program("toolame") != 0) return (TC_EXPORT_ERROR);
-+ /* check for twolame */
-+ if (tc_test_program("twolame") != 0) return (TC_EXPORT_ERROR);
-
- /* verbose? */
- verb = (verbose & TC_DEBUG) ? 2:0;
-@@ -123,10 +123,10 @@ MOD_open
- ofreq_dec = ofreq-ofreq_int*1000;
- */
-
-- /* toolame command line */
-+ /* twolame command line */
- /* ptr is a pointer into buf */
- tc_snprintf(ptr, sizeof(buf) - (ptr-buf),
-- "toolame -s %0.3f -b %d -m %c - \"%s\" 2>/dev/null %s",
-+ "twolame -s %0.3f -b %d -m %c - \"%s\" 2>/dev/null %s",
- (double)ofreq/1000.0, orate, chan, vob->audio_out_file,
- (vob->ex_a_string?vob->ex_a_string:""));
-
diff --git a/debian/patches/series b/debian/patches/series
index e2b6439..db2171b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
01_filter_pv.c.diff
-02_toolame.diff
03_libav-api-fixes.diff
--
transcode packaging
More information about the pkg-multimedia-commits
mailing list