summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-11-05 11:58:25 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-11-05 11:58:25 +0000
commit4e76145381944090d221c76d5b6b0dab786508cc (patch)
tree062c405fa496d468a051c12f2d96865dfea52259 /libmpcodecs
parenteeaa5eb45fe1f2a72dc8c55ed50008ca40b55428 (diff)
downloadmpv-4e76145381944090d221c76d5b6b0dab786508cc.tar.bz2
mpv-4e76145381944090d221c76d5b6b0dab786508cc.tar.xz
Speex support. Seeking and pts generation does not work.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16916 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/Makefile4
-rw-r--r--libmpcodecs/ad.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile
index 74f0287dde..a41d9e73ea 100644
--- a/libmpcodecs/Makefile
+++ b/libmpcodecs/Makefile
@@ -209,6 +209,10 @@ ifeq ($(MUSEPACK),yes)
AUDIO_SRCS += ad_mpc.c
endif
+ifeq ($(SPEEX),yes)
+AUDIO_SRCS += ad_speex.c
+endif
+
ifeq ($(FAAC),yes)
ENCODER_SRCS += ae_faac.c
endif
diff --git a/libmpcodecs/ad.c b/libmpcodecs/ad.c
index c6d0b3291a..44f164cb5f 100644
--- a/libmpcodecs/ad.c
+++ b/libmpcodecs/ad.c
@@ -33,6 +33,7 @@ extern ad_functions_t mpcodecs_ad_acm;
extern ad_functions_t mpcodecs_ad_msgsm;
extern ad_functions_t mpcodecs_ad_faad;
extern ad_functions_t mpcodecs_ad_libvorbis;
+extern ad_functions_t mpcodecs_ad_speex;
extern ad_functions_t mpcodecs_ad_libmad;
extern ad_functions_t mpcodecs_ad_realaud;
extern ad_functions_t mpcodecs_ad_libdv;
@@ -78,6 +79,9 @@ ad_functions_t* mpcodecs_ad_drivers[] =
#ifdef HAVE_OGGVORBIS
&mpcodecs_ad_libvorbis,
#endif
+#ifdef HAVE_SPEEX
+ &mpcodecs_ad_speex,
+#endif
#ifdef USE_LIBMAD
&mpcodecs_ad_libmad,
#endif