ref: 05bf85572c49979cc3f07dc73ae1b8a4f429732e
parent: e1dd26ac90eb13db2af4665f8121768995854bc9
parent: 0957f2eb36d6ac24a7dbbddc068f7c66e644b783
author: Rob Sykes <robs@users.sourceforge.net>
date: Tue Aug 30 06:20:51 EDT 2011
Merge branch 'master' of ssh://sox.git.sourceforge.net/gitroot/sox/sox
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,25 @@
-sox (14.3.2-1cvs1) UNRELEASED; urgency=low
+sox (14.3.2-2cvs1) UNRELEASED; urgency=low
* CVS Version.
+ * [debian/patches/01_transition_to_libav.patch]:
+ - Removed, fixed upstream.
+
+ -- Pascal Giard <evilynux@gmail.com> Mon, 22 Aug 2011 00:47:21 -0400
+
+sox (14.3.2-2) unstable; urgency=low
+
+ * Dynamically link against libmp3lame now that it's part of main
+ (closes: #627687).
+ * Preparing for transition from ffmpeg to libav (closes: #638206).
+ * [debian/rules]:
+ - Removed --enable-dl-lame, no longer needed.
* [debian/control]:
- - Minor change to sox description mentioning mp3 support.
+ - Added Build-Dep on libmp3lame-dev.
+ - Updated libsox-fmt-mp3 to reflect the change.
+ * [debian/patches/01_transition_to_libav.patch]:
+ - Added support for libav while still supporting ffmpeg.
- -- Pascal Giard <evilynux@gmail.com> Fri, 04 Mar 2011 11:26:23 -0500
+ -- Pascal Giard <pascal@debian.org> Sun, 21 Aug 2011 23:57:28 -0400
sox (14.3.2-1) unstable; urgency=low
--- a/debian/control
+++ b/debian/control
@@ -16,6 +16,7 @@
libltdl3-dev,
libmad0-dev,
libmagic-dev,
+ libmp3lame-dev,
libopencore-amrnb-dev,
libopencore-amrwb-dev,
libpng12-dev,
@@ -42,7 +43,7 @@
SoX is able to handle formats like Ogg Vorbis, MP3, WAV, AIFF, VOC, SND, AU,
GSM and several more.
Any format support requires at least libsox-fmt-base. Some formats have their
- own package e.g. mp3 support is provided by libsox-fmt-mp3.
+ own package e.g. mp3 read and write support is provided by libsox-fmt-mp3.
.
SoX supports most common sound architectures i.e. Alsa, Libao, OSS and Pulse
(respectively provided by libsox-fmt-alsa, libsox-fmt-ao, libsox-fmt-oss and
@@ -119,7 +120,7 @@
SoX is the swiss army knife of sound processing.
.
This package contains the SoX MP3 format library.
- Read support by libmad. Write support is available if libmp3lame is installed.
+ Read support by libmad. Write support by libmp3lame.
.
libmad: http://www.underbit.com/products/mad/
lame: http://lame.sourceforge.net/
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,6 @@
include /usr/share/cdbs/1/rules/simple-patchsys.mk
CPPFLAGS += -I/usr/include/ffmpeg
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-dl-lame --with-distro="$(shell dpkg-vendor --query vendor)" --with-dyn-default
+DEB_CONFIGURE_EXTRA_FLAGS := --with-distro="$(shell dpkg-vendor --query vendor)" --with-dyn-default
# Takes care of postinst-has-useless-call-to-ldconfig for libsox-fmt-*
DEB_DH_MAKESHLIBS_ARGS := -Xfmt
--- a/src/ffmpeg.c
+++ b/src/ffmpeg.c
@@ -50,6 +50,13 @@
#include <ctype.h>
#include "ffmpeg.h"
+#ifndef CODEC_TYPE_AUDIO
+#define CODEC_TYPE_AUDIO AVMEDIA_TYPE_AUDIO
+#endif
+#ifndef PKT_FLAG_KEY
+#define PKT_FLAG_KEY AV_PKT_FLAG_KEY
+#endif
+
/* Private data for ffmpeg files */
typedef struct {int audio_index;