diff options
| author | Robin H. Johnson <robbat2@gentoo.org> | 2009-01-14 00:35:17 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2009-01-14 00:35:17 +0000 |
| commit | 12c7e7c0bc554781b5785f803755caa6054dc572 (patch) | |
| tree | 7868384432a42dfd75f3f5558dd77870f113b4b6 | |
| parent | 1729f3076da9164576c56c422318d527e026f129 (diff) | |
| download | xine-lib-12c7e7c0bc554781b5785f803755caa6054dc572.tar.gz xine-lib-12c7e7c0bc554781b5785f803755caa6054dc572.tar.bz2 | |
Fix building against ImageMagick 6.4.5
Date: Tue Nov 18 2008 00:57:00 +0000
Upstream ImageMagick changed part of the API and did not update their
deprecated support stuff, so bump us along for now to avoid having to
downgrade.
| -rw-r--r-- | src/libxinevdec/image.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/libxinevdec/image.c b/src/libxinevdec/image.c index 51e5d0309..a4d09a63c 100644 --- a/src/libxinevdec/image.c +++ b/src/libxinevdec/image.c @@ -50,6 +50,15 @@ #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; |