diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-01-01 17:35:04 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-01-01 17:35:04 +0000 |
| commit | f6ad0cf7c06e14f4f9e09e56a546db1692cfe09d (patch) | |
| tree | 3889c94ee31c8c7a6f8a3bf97f70617476284e95 /src/combined/ffmpeg | |
| parent | 9285ce63facf833394d79d4e5be6adfa4c70eac6 (diff) | |
| parent | 284db4a4fc4941b7a3b903d3ab23b04840517fd1 (diff) | |
| download | xine-lib-f6ad0cf7c06e14f4f9e09e56a546db1692cfe09d.tar.gz xine-lib-f6ad0cf7c06e14f4f9e09e56a546db1692cfe09d.tar.bz2 | |
Merge (with adjustment) from 1.1.
--HG--
rename : src/libfaad/Makefile.am => contrib/libfaad/Makefile.am
rename : include/xine.h.in => include/xine.h
rename : src/libffmpeg/Makefile.am => src/combined/ffmpeg/Makefile.am
rename : src/libmpeg2/Makefile.am => src/video_dec/libmpeg2/Makefile.am
Diffstat (limited to 'src/combined/ffmpeg')
| -rw-r--r-- | src/combined/ffmpeg/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/combined/ffmpeg/Makefile.am b/src/combined/ffmpeg/Makefile.am index 42fe20f95..b9dee7ea6 100644 --- a/src/combined/ffmpeg/Makefile.am +++ b/src/combined/ffmpeg/Makefile.am @@ -53,7 +53,7 @@ endif nodist_xineplug_decode_ff_la_SOURCES = ffmpeg_config.h -xineplug_decode_ff_la_LIBADD = $(MLIB_LIBS) $(XINE_LIB) -lm $(ZLIB_LIBS) \ +xineplug_decode_ff_la_LIBADD = $(XINE_LIB) $(MLIB_LIBS) -lm $(ZLIB_LIBS) \ $(link_ffmpeg) $(PTHREAD_LIBS) $(LTLIBINTL) xineplug_decode_ff_la_LDFLAGS = $(AM_LDFLAGS) $(IMPURE_TEXT_LDFLAGS) |