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/libfaad | |
| 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/libfaad')
| -rw-r--r-- | src/libfaad/Makefile.am | 8 | ||||
| -rw-r--r-- | src/libfaad/xine_faad_decoder.c (renamed from src/libfaad/xine_decoder.c) | 0 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/libfaad/Makefile.am b/src/libfaad/Makefile.am index dcc57792a..d1a4ed865 100644 --- a/src/libfaad/Makefile.am +++ b/src/libfaad/Makefile.am @@ -2,13 +2,11 @@ include $(top_srcdir)/misc/Makefile.common SUBDIRS = codebook -libdir = $(XINE_PLUGINDIR) - if BUILD_FAAD faad_module = xineplug_decode_faad.la endif -lib_LTLIBRARIES = $(faad_module) +xineplug_LTLIBRARIES = $(faad_module) VPATH = @srcdir@:@srcdir@/codebook: @@ -52,9 +50,9 @@ xineplug_decode_faad_la_SOURCES = \ ssr_ipqf.c \ syntax.c \ tns.c \ - xine_decoder.c + xine_faad_decoder.c -xineplug_decode_faad_la_LDFLAGS = -avoid-version -module +xineplug_decode_faad_la_LDFLAGS = $(xineplug_ldflags) xineplug_decode_faad_la_LIBADD = -lm $(XINE_LIB) noinst_HEADERS = \ diff --git a/src/libfaad/xine_decoder.c b/src/libfaad/xine_faad_decoder.c index aa528a34d..aa528a34d 100644 --- a/src/libfaad/xine_decoder.c +++ b/src/libfaad/xine_faad_decoder.c |