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/libfaad | |
| 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/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 |