diff options
Diffstat (limited to 'src/video_dec')
-rw-r--r-- | src/video_dec/Makefile.am | 1 | ||||
-rw-r--r-- | src/video_dec/image.c | 9 | ||||
-rw-r--r-- | src/video_dec/libmpeg2/Makefile.am | 1 | ||||
-rw-r--r-- | src/video_dec/libmpeg2new/Makefile.am | 1 |
4 files changed, 3 insertions, 9 deletions
diff --git a/src/video_dec/Makefile.am b/src/video_dec/Makefile.am index bbafba88d..f6984a8a2 100644 --- a/src/video_dec/Makefile.am +++ b/src/video_dec/Makefile.am @@ -2,6 +2,7 @@ SUBDIRS = \ libmpeg2 \ libmpeg2new +include $(top_builddir)/misc/Makefile.plugins include $(top_srcdir)/misc/Makefile.common AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) diff --git a/src/video_dec/image.c b/src/video_dec/image.c index 8ef8329cf..3413bb96f 100644 --- a/src/video_dec/image.c +++ b/src/video_dec/image.c @@ -50,15 +50,6 @@ #include <xine/xineutils.h> #include "bswap.h" -/* In 6.4.5.4 MagickGetImagePixels changed to MagickGetAuthenticPixels - * But upstream did not update their deprecated compat stuff. - * So do a fun hack to make it work. - * - 2008/11/26 Robin H. Johnson <robbat2@gentoo.org> - */ -#if MagickLibVersion >= 0x645 -#define MagickGetImagePixels MagickGetAuthenticPixels -#endif - typedef struct { video_decoder_class_t decoder_class; diff --git a/src/video_dec/libmpeg2/Makefile.am b/src/video_dec/libmpeg2/Makefile.am index 56751daf8..f0dd252eb 100644 --- a/src/video_dec/libmpeg2/Makefile.am +++ b/src/video_dec/libmpeg2/Makefile.am @@ -1,3 +1,4 @@ +include $(top_builddir)/misc/Makefile.plugins include $(top_srcdir)/misc/Makefile.common AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) diff --git a/src/video_dec/libmpeg2new/Makefile.am b/src/video_dec/libmpeg2new/Makefile.am index bc322169d..f79b8aba9 100644 --- a/src/video_dec/libmpeg2new/Makefile.am +++ b/src/video_dec/libmpeg2new/Makefile.am @@ -1,3 +1,4 @@ +include $(top_builddir)/misc/Makefile.plugins include $(top_srcdir)/misc/Makefile.common AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) |