diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-06 21:38:54 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-06 21:38:54 +0200 |
| commit | 2839776b4fe1c282f3f2938d52408a51ca6def96 (patch) | |
| tree | c3fb4489f4b8f5c8c650f772e864984d8c32e50c /src/libdts | |
| parent | a800128f70a60ab7544d4ed4d3bf101c3d1839d2 (diff) | |
| parent | 6ca146bc0ffc2825402a8fb39b156394a614c1f0 (diff) | |
| download | xine-lib-2839776b4fe1c282f3f2938d52408a51ca6def96.tar.gz xine-lib-2839776b4fe1c282f3f2938d52408a51ca6def96.tar.bz2 | |
Merge changes from main repository.
Diffstat (limited to 'src/libdts')
| -rw-r--r-- | src/libdts/Makefile.am | 8 | ||||
| -rw-r--r-- | src/libdts/xine_dts_decoder.c (renamed from src/libdts/xine_decoder.c) | 0 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/libdts/Makefile.am b/src/libdts/Makefile.am index 4cf54884f..207755f1f 100644 --- a/src/libdts/Makefile.am +++ b/src/libdts/Makefile.am @@ -1,12 +1,10 @@ include $(top_srcdir)/misc/Makefile.common -libdir = $(XINE_PLUGINDIR) - if DTS dts_module = xineplug_decode_dts.la endif -lib_LTLIBRARIES = $(dts_module) +xineplug_LTLIBRARIES = $(dts_module) if EXTERNAL_LIBDTS fnsa = @@ -16,9 +14,9 @@ fnsa = -fno-strict-aliasing internal_sources = bitstream.c downmix.c parse.c endif -xineplug_decode_dts_la_SOURCES = xine_decoder.c $(internal_sources) +xineplug_decode_dts_la_SOURCES = xine_dts_decoder.c $(internal_sources) xineplug_decode_dts_la_CFLAGS = $(LIBDTS_CFLAGS) $(VISIBILITY_FLAG) $(fnsa) -xineplug_decode_dts_la_LDFLAGS = -avoid-version -module +xineplug_decode_dts_la_LDFLAGS = $(xineplug_ldflags) if EXTERNAL_LIBDTS xineplug_decode_dts_la_LIBADD = $(XINE_LIB) $(LIBDTS_LIBS) -lm diff --git a/src/libdts/xine_decoder.c b/src/libdts/xine_dts_decoder.c index 902d8c5b6..902d8c5b6 100644 --- a/src/libdts/xine_decoder.c +++ b/src/libdts/xine_dts_decoder.c |