From f45651f26bc3aa1b312d282c5d8c4b04be0c2505 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Thu, 25 Aug 2005 15:36:29 +0000 Subject: *BUGFIX* Windows ports fixes and improvements due to my current work on toxine: - first experiments with external win32 pthreads, more portable code (pthread_t may be a struct) - headers refactored - moved dirent win32 replacement to lib/, hide it for frontends, used system version, if found, not used non-POSIX dirent->d_reclen (this item doesn't work in MinGW), fix memleak in dvb - separated settings for postproc and avcodec when using external ffmpeg - check for malloc.h in public xine.m4, used it conditionally in xine headers - replaced random() by POSIX more common rand() - prevent one segfault in directx vo plugin, if fails - M$VC port update CVS patchset: 7709 CVS date: 2005/08/25 15:36:29 --- src/post/planar/Makefile.am | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/post/planar') diff --git a/src/post/planar/Makefile.am b/src/post/planar/Makefile.am index 5eeae5a58..f0c512228 100644 --- a/src/post/planar/Makefile.am +++ b/src/post/planar/Makefile.am @@ -1,7 +1,12 @@ include $(top_srcdir)/misc/Makefile.common AM_CFLAGS = -I$(top_srcdir)/src/libffmpeg/libavcodec/libpostproc -POSTPROC_LIB = $(top_builddir)/src/libffmpeg/libavcodec/libpostproc/libpostprocess.la +if HAVE_FFMPEG +POSTPROC_LIB = $(FFMPEG_POSTPROC_LIBS) +else +POSTPROC_LIB = $(top_builddir)/src/libffmpeg/libavcodec/libpostproc/libpostprocess.la +POSTPROC_DEP = $(POSTPROC_LIB) +endif libdir = $(XINE_PLUGINDIR)/post @@ -9,8 +14,8 @@ lib_LTLIBRARIES = xineplug_post_planar.la xineplug_post_planar_la_SOURCES = planar.c invert.c expand.c fill.c boxblur.c \ denoise3d.c eq.c eq2.c unsharp.c pp.c -xineplug_post_planar_la_DEPENDENCIES = $(POSTPROC_LIB) -xineplug_post_planar_la_LIBADD = $(XINE_LIB) $(POSTPROC_LIB) -lm +xineplug_post_planar_la_DEPENDENCIES = $(POSTPROC_DEP) +xineplug_post_planar_la_LIBADD = $(XINE_LIB) $(POSTPROC_LIB) -lm $(THREAD_LIBS) xineplug_post_planar_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ $(POSTPROC_LIB): -- cgit v1.2.3