[FFmpeg-cvslog] Move timefilter code from lavf to lavd.
Anton Khirnov
git at videolan.org
Sat Oct 22 01:26:51 CEST 2011
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Fri Oct 21 11:47:39 2011 +0200| [5dd35b43f1cd3dddaddaae8e2f267117b5fa2d54] | committer: Anton Khirnov
Move timefilter code from lavf to lavd.
It's only used in the JACK device.
Fixes linking shared lavd with JACK enabled.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5dd35b43f1cd3dddaddaae8e2f267117b5fa2d54
---
libavdevice/Makefile | 4 +++-
libavdevice/jack_audio.c | 2 +-
{libavformat => libavdevice}/timefilter.c | 2 +-
{libavformat => libavdevice}/timefilter.h | 6 +++---
libavformat/Makefile | 5 +----
5 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/libavdevice/Makefile b/libavdevice/Makefile
index d8a5945..1f2a6ef 100644
--- a/libavdevice/Makefile
+++ b/libavdevice/Makefile
@@ -13,7 +13,7 @@ OBJS-$(CONFIG_ALSA_OUTDEV) += alsa-audio-common.o \
OBJS-$(CONFIG_BKTR_INDEV) += bktr.o
OBJS-$(CONFIG_DV1394_INDEV) += dv1394.o
OBJS-$(CONFIG_FBDEV_INDEV) += fbdev.o
-OBJS-$(CONFIG_JACK_INDEV) += jack_audio.o
+OBJS-$(CONFIG_JACK_INDEV) += jack_audio.o timefilter.o
OBJS-$(CONFIG_OSS_INDEV) += oss_audio.o
OBJS-$(CONFIG_OSS_OUTDEV) += oss_audio.o
OBJS-$(CONFIG_SNDIO_INDEV) += sndio_common.o sndio_dec.o
@@ -30,4 +30,6 @@ OBJS-$(CONFIG_LIBDC1394_INDEV) += libdc1394.o
SKIPHEADERS-$(HAVE_ALSA_ASOUNDLIB_H) += alsa-audio.h
SKIPHEADERS-$(HAVE_SNDIO_H) += sndio_common.h
+TESTPROGS = timefilter
+
include $(SRC_PATH)/subdir.mak
diff --git a/libavdevice/jack_audio.c b/libavdevice/jack_audio.c
index 4907e82..f75c176 100644
--- a/libavdevice/jack_audio.c
+++ b/libavdevice/jack_audio.c
@@ -29,7 +29,7 @@
#include "libavutil/opt.h"
#include "libavcodec/avcodec.h"
#include "libavformat/avformat.h"
-#include "libavformat/timefilter.h"
+#include "timefilter.h"
/**
* Size of the internal FIFO buffers as a number of audio packets
diff --git a/libavformat/timefilter.c b/libavdevice/timefilter.c
similarity index 99%
rename from libavformat/timefilter.c
rename to libavdevice/timefilter.c
index 4860a4f..332d33b 100644
--- a/libavformat/timefilter.c
+++ b/libavdevice/timefilter.c
@@ -24,8 +24,8 @@
#include "config.h"
-#include "avformat.h"
#include "timefilter.h"
+#include "libavutil/mem.h"
struct TimeFilter {
/// Delay Locked Loop data. These variables refer to mathematical
diff --git a/libavformat/timefilter.h b/libavdevice/timefilter.h
similarity index 97%
rename from libavformat/timefilter.h
rename to libavdevice/timefilter.h
index aa7db53..c98fd03 100644
--- a/libavformat/timefilter.h
+++ b/libavdevice/timefilter.h
@@ -22,8 +22,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef AVFORMAT_TIMEFILTER_H
-#define AVFORMAT_TIMEFILTER_H
+#ifndef AVDEVICE_TIMEFILTER_H
+#define AVDEVICE_TIMEFILTER_H
/**
* Opaque type representing a time filter state
@@ -94,4 +94,4 @@ void ff_timefilter_reset(TimeFilter *);
*/
void ff_timefilter_destroy(TimeFilter *);
-#endif /* AVFORMAT_TIMEFILTER_H */
+#endif /* AVDEVICE_TIMEFILTER_H */
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 0a30c6e..6973b15 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -334,11 +334,8 @@ OBJS-$(CONFIG_RTP_PROTOCOL) += rtpproto.o
OBJS-$(CONFIG_TCP_PROTOCOL) += tcp.o
OBJS-$(CONFIG_UDP_PROTOCOL) += udp.o
-# libavdevice dependencies
-OBJS-$(CONFIG_JACK_INDEV) += timefilter.o
-
EXAMPLES = metadata output
-TESTPROGS = seek timefilter
+TESTPROGS = seek
TOOLS = pktdumper probetest
include $(SRC_PATH)/subdir.mak
More information about the ffmpeg-cvslog
mailing list