diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-04 23:53:39 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-04 23:53:39 +0200 |
| commit | ca897ff0f84cdc7fc83449d1d06dcc9528edbb97 (patch) | |
| tree | 313c6245e23b257a05f220c65c6cdf2d474323be /src/libmusepack | |
| parent | 60a408c3446733dc752979c1eab579c25a4a4897 (diff) | |
| parent | f5dc5087a79d813259a674bd96ba4dea43fb254c (diff) | |
| download | xine-lib-ca897ff0f84cdc7fc83449d1d06dcc9528edbb97.tar.gz xine-lib-ca897ff0f84cdc7fc83449d1d06dcc9528edbb97.tar.bz2 | |
Merge with main repository.
--HG--
rename : src/libffmpeg/dvaudio_decoder.c => src/libffmpeg/ff_dvaudio_decoder.c
rename : src/libffmpeg/video_decoder.c => src/libffmpeg/ff_video_decoder.c
rename : src/libffmpeg/xine_decoder.h => src/libffmpeg/ffmpeg_decoder.h
rename : src/libffmpeg/xine_encoder.c => src/libffmpeg/ffmpeg_encoder.c
Diffstat (limited to 'src/libmusepack')
| -rw-r--r-- | src/libmusepack/Makefile.am | 9 | ||||
| -rw-r--r-- | src/libmusepack/xine_musepack_decoder.c (renamed from src/libmusepack/xine_decoder.c) | 0 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/libmusepack/Makefile.am b/src/libmusepack/Makefile.am index 021ec0985..d39426597 100644 --- a/src/libmusepack/Makefile.am +++ b/src/libmusepack/Makefile.am @@ -4,10 +4,8 @@ SUBDIRS = musepack EXTRA_DIST = diff_against_svn.patch -libdir = $(XINE_PLUGINDIR) - if MUSEPACK -lib_LTLIBRARIES = xineplug_decode_mpc.la +xineplug_LTLIBRARIES = xineplug_decode_mpc.la endif if EXTERNAL_MPCDEC @@ -23,7 +21,6 @@ else xineplug_decode_mpc_la_LIBADD = $(XINE_LIB) endif -xineplug_decode_mpc_la_SOURCES = $(internal_sources) xine_decoder.c +xineplug_decode_mpc_la_SOURCES = $(internal_sources) xine_musepack_decoder.c xineplug_decode_mpc_la_CFLAGS = $(VISIBILITY_FLAG) -xineplug_decode_mpc_la_LDFLAGS = -avoid-version -module - +xineplug_decode_mpc_la_LDFLAGS = $(xineplug_ldflags) diff --git a/src/libmusepack/xine_decoder.c b/src/libmusepack/xine_musepack_decoder.c index 26c2eddf5..26c2eddf5 100644 --- a/src/libmusepack/xine_decoder.c +++ b/src/libmusepack/xine_musepack_decoder.c |