summaryrefslogtreecommitdiff
path: root/src/libspucc
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-04-06 21:38:54 +0200
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-04-06 21:38:54 +0200
commit2839776b4fe1c282f3f2938d52408a51ca6def96 (patch)
treec3fb4489f4b8f5c8c650f772e864984d8c32e50c /src/libspucc
parenta800128f70a60ab7544d4ed4d3bf101c3d1839d2 (diff)
parent6ca146bc0ffc2825402a8fb39b156394a614c1f0 (diff)
downloadxine-lib-2839776b4fe1c282f3f2938d52408a51ca6def96.tar.gz
xine-lib-2839776b4fe1c282f3f2938d52408a51ca6def96.tar.bz2
Merge changes from main repository.
Diffstat (limited to 'src/libspucc')
-rw-r--r--src/libspucc/Makefile.am6
-rw-r--r--src/libspucc/xine_cc_decoder.c (renamed from src/libspucc/xine_decoder.c)0
2 files changed, 2 insertions, 4 deletions
diff --git a/src/libspucc/Makefile.am b/src/libspucc/Makefile.am
index fff0ab47c..aefe4d7c1 100644
--- a/src/libspucc/Makefile.am
+++ b/src/libspucc/Makefile.am
@@ -1,10 +1,8 @@
include $(top_srcdir)/misc/Makefile.common
-libdir = $(XINE_PLUGINDIR)
+xineplug_LTLIBRARIES = xineplug_decode_spucc.la
-lib_LTLIBRARIES = xineplug_decode_spucc.la
-
-xineplug_decode_spucc_la_SOURCES = cc_decoder.c xine_decoder.c
+xineplug_decode_spucc_la_SOURCES = cc_decoder.c xine_cc_decoder.c
xineplug_decode_spucc_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) -fno-strict-aliasing
xineplug_decode_spucc_la_LIBADD = $(XINE_LIB)
xineplug_decode_spucc_la_LDFLAGS = -avoid-version -module
diff --git a/src/libspucc/xine_decoder.c b/src/libspucc/xine_cc_decoder.c
index 1a32274f6..1a32274f6 100644
--- a/src/libspucc/xine_decoder.c
+++ b/src/libspucc/xine_cc_decoder.c