diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-01-17 16:01:53 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-01-17 16:01:53 +0000 |
| commit | 896d352d7c65545d648805885d54f7b10c17329c (patch) | |
| tree | 53411bc9808f67ffe9fad2590a1f77103c0eb010 /src/video_dec/image.c | |
| parent | e80b58148fe11ba0770e6e2927faca06d6408574 (diff) | |
| parent | e886af1e544dc7db4abad76bdb14fe53a5467ced (diff) | |
| download | xine-lib-896d352d7c65545d648805885d54f7b10c17329c.tar.gz xine-lib-896d352d7c65545d648805885d54f7b10c17329c.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/libfaad/Makefile.am => contrib/libfaad/Makefile.am
rename : src/libxineadec/Makefile.am => src/audio_dec/Makefile.am
rename : src/libxinevdec/Makefile.am => src/video_dec/Makefile.am
rename : src/libxinevdec/image.c => src/video_dec/image.c
rename : src/libmpeg2/Makefile.am => src/video_dec/libmpeg2/Makefile.am
rename : src/libmpeg2new/Makefile.am => src/video_dec/libmpeg2new/Makefile.am
Diffstat (limited to 'src/video_dec/image.c')
| -rw-r--r-- | src/video_dec/image.c | 9 |
1 files changed, 0 insertions, 9 deletions
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; |