diff options
| author | Lennart Poettering <lennart@poettering.net> | 2007-08-25 22:27:24 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2007-08-25 22:27:24 +0000 |
| commit | f4e2d2331afb48b304ca6b1402b43f1727343aa2 (patch) | |
| tree | a72e740fc8a7fd3f5d5d0060561a9817d616752e | |
| parent | 9439e81de18928ea6c373c18eebf048d51801c3a (diff) | |
include ffmpeg resampler in build
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1718 fefdeb5f-60dc-0310-8127-8f9354f1896f
| -rw-r--r-- | src/Makefile.am | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 097b0831..0bdc3f79 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -559,7 +559,7 @@ libpulsedsp_la_LDFLAGS = -avoid-version # Speex Resampler # ################################### -noinst_LTLIBRARIES = libspeex-resampler-fixed.la libspeex-resampler-float.la +noinst_LTLIBRARIES = libspeex-resampler-fixed.la libspeex-resampler-float.la libffmpeg-resampler.la libspeex_resampler_fixed_la_CPPFLAGS = $(AM_CPPFLAGS) -DRANDOM_PREFIX=paspfx -DOUTSIDE_SPEEX -DFIXED_POINT libspeex_resampler_fixed_la_SOURCES = pulsecore/speex/resample.c pulsecore/speex/speex_resampler.h pulsecore/speex/arch.h pulsecore/speex/fixed_generic.h @@ -567,6 +567,9 @@ libspeex_resampler_fixed_la_SOURCES = pulsecore/speex/resample.c pulsecore/speex libspeex_resampler_float_la_CPPFLAGS = $(AM_CPPFLAGS) -DRANDOM_PREFIX=paspfl -DOUTSIDE_SPEEX libspeex_resampler_float_la_SOURCES = pulsecore/speex/resample.c pulsecore/speex/speex_resampler.h pulsecore/speex/arch.h +libffmpeg_resampler_la_CPPFLAGS = $(AM_CPPFLAGS) +libffmpeg_resampler_la_SOURCES = pulsecore/ffmpeg/resample2.c + ################################### # Daemon core library # ################################### @@ -712,7 +715,7 @@ endif libpulsecore_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBOIL_CFLAGS) libpulsecore_la_LDFLAGS = -version-info $(LIBPULSECORE_VERSION_INFO) -libpulsecore_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS) $(WINSOCK_LIBS) $(LIBOIL_LIBS) $(LIBICONV) libspeex-resampler-fixed.la libspeex-resampler-float.la +libpulsecore_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS) $(WINSOCK_LIBS) $(LIBOIL_LIBS) $(LIBICONV) libspeex-resampler-fixed.la libspeex-resampler-float.la libffmpeg-resampler.la ################################### # Plug-in support libraries # @@ -1403,4 +1406,7 @@ update-speex: wget -O pulsecore/speex/arch.h http://svn.xiph.org/trunk/speex/libspeex/arch.h wget -O pulsecore/speex/fixed_generic.h http://svn.xiph.org/trunk/speex/libspeex/fixed_generic.h +update-ffmpeg: + wget -O pulsecore/ffmpeg/resample2.c http://svn.mplayerhq.hu/ffmpeg/trunk/libavcodec/resample2.c?view=co + .PHONY: utils/padsp |