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/libspudec | |
| 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/libspudec')
| -rw-r--r-- | src/libspudec/Makefile.am | 10 | ||||
| -rw-r--r-- | src/libspudec/xine_spu_decoder.c (renamed from src/libspudec/xine_decoder.c) | 0 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/libspudec/Makefile.am b/src/libspudec/Makefile.am index d50c49ca6..208d994f5 100644 --- a/src/libspudec/Makefile.am +++ b/src/libspudec/Makefile.am @@ -1,14 +1,12 @@ include $(top_srcdir)/misc/Makefile.common -libdir = $(XINE_PLUGINDIR) - -lib_LTLIBRARIES = xineplug_decode_spu.la +xineplug_LTLIBRARIES = xineplug_decode_spu.la if HAVE_DVDNAV xineplug_decode_spu_la_SOURCES = \ spu.c \ - xine_decoder.c + xine_spu_decoder.c xineplug_decode_spu_la_LIBADD = $(XINE_LIB) $(DVDNAV_LIBS) $(PTHREAD_LIBS) else @@ -16,13 +14,13 @@ else xineplug_decode_spu_la_SOURCES = \ nav_read.c \ spu.c \ - xine_decoder.c + xine_spu_decoder.c AM_CPPFLAGS = -I$(top_srcdir)/src/input/libdvdnav xineplug_decode_spu_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) endif xineplug_decode_spu_la_CFLAGS = $(DVDNAV_CFLAGS) $(VISIBILITY_FLAG) -xineplug_decode_spu_la_LDFLAGS = -avoid-version -module +xineplug_decode_spu_la_LDFLAGS = $(xineplug_ldflags) noinst_HEADERS = spu.h diff --git a/src/libspudec/xine_decoder.c b/src/libspudec/xine_spu_decoder.c index 30c7f18c9..30c7f18c9 100644 --- a/src/libspudec/xine_decoder.c +++ b/src/libspudec/xine_spu_decoder.c |