From 21272e4f1caa9d0b3fe81f68929e8bbba125a977 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Sun, 29 Feb 2004 17:26:45 +0000 Subject: 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 --- src/libffmpeg/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/libffmpeg') 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 -- cgit v1.2.3