diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-01-16 16:52:16 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-01-16 16:52:16 +0000 |
| commit | 330f70c22473c5e34607eec6115fe23808bbb7ed (patch) | |
| tree | 831be30594703239843aebc3fa662c548cf4b0b4 | |
| parent | 1e4d899aecd0afc439100193c1dce562402e5a52 (diff) | |
| parent | e369f8281863325279b525a45caabb0e37578b94 (diff) | |
| download | xine-lib-330f70c22473c5e34607eec6115fe23808bbb7ed.tar.gz xine-lib-330f70c22473c5e34607eec6115fe23808bbb7ed.tar.bz2 | |
Merge.
| -rw-r--r-- | src/libxinevdec/image.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/libxinevdec/image.c b/src/libxinevdec/image.c index 7592e0bb5..5f7a776ef 100644 --- a/src/libxinevdec/image.c +++ b/src/libxinevdec/image.c @@ -50,15 +50,6 @@ #include "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; |