diff options
| author | František Dvořák <valtri@users.sourceforge.net> | 2004-02-29 17:26:45 +0000 |
|---|---|---|
| committer | František Dvořák <valtri@users.sourceforge.net> | 2004-02-29 17:26:45 +0000 |
| commit | 21272e4f1caa9d0b3fe81f68929e8bbba125a977 (patch) | |
| tree | 34e6b88093d79653a2bdd60a9a127a18cfda2f1d /src/libffmpeg | |
| parent | a657c3df2f453941b115de0ece3ad8d849d58a6b (diff) | |
| download | xine-lib-21272e4f1caa9d0b3fe81f68929e8bbba125a977.tar.gz xine-lib-21272e4f1caa9d0b3fe81f68929e8bbba125a977.tar.bz2 | |
Various compilation fixes and updates:
- xine compilable without iconv (scream if I something broke)
- update MSVC port, fixes in avi demux
- add iff.h into makefiles
- ffmpeg depends on zlib (build was OK only when freetype was installed)
- commit a patch for goom
CVS patchset: 6192
CVS date: 2004/02/29 17:26:45
Diffstat (limited to 'src/libffmpeg')
| -rw-r--r-- | src/libffmpeg/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libffmpeg/Makefile.am b/src/libffmpeg/Makefile.am index 4ba409023..c65d83dc3 100644 --- a/src/libffmpeg/Makefile.am +++ b/src/libffmpeg/Makefile.am @@ -23,7 +23,7 @@ xineplug_decode_ff_la_SOURCES = xine_decoder.c audio_decoder.c video_decoder.c xineplug_decode_ff_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ endif -xineplug_decode_ff_la_LIBADD = $(MLIB_LIBS) $(XINE_LIB) -lm \ +xineplug_decode_ff_la_LIBADD = $(MLIB_LIBS) $(XINE_LIB) -lm $(ZLIB_LIBS) \ $(top_builddir)/src/libffmpeg/libavcodec/libavcodec.la \ $(top_builddir)/src/libffmpeg/libavcodec/libpostproc/libpostprocess.la |