diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-01-14 00:58:53 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-01-14 00:58:53 +0000 |
| commit | 7dc471882c5cb83af78a9357fa71efed75ac47df (patch) | |
| tree | 6d3989052d13d40c608c15a529d6f9afe29ed1ea /src | |
| parent | 101c3a13de83f9e344b00a06eeecbcd43e1be638 (diff) | |
| parent | 9776c5dad4e77cb84f27961a50cc24993785e54a (diff) | |
| download | xine-lib-7dc471882c5cb83af78a9357fa71efed75ac47df.tar.gz xine-lib-7dc471882c5cb83af78a9357fa71efed75ac47df.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/libxinevdec/image.c => src/video_dec/image.c
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_dec/image.c | 13 | ||||
| -rw-r--r-- | src/xine-engine/load_plugins.c | 2 |
2 files changed, 12 insertions, 3 deletions
diff --git a/src/video_dec/image.c b/src/video_dec/image.c index f4d39b5dc..8ef8329cf 100644 --- a/src/video_dec/image.c +++ b/src/video_dec/image.c @@ -50,6 +50,15 @@ #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; @@ -88,7 +97,7 @@ static void image_decode_data (video_decoder_t *this_gen, buf_element_t *buf) { if (buf->decoder_flags & BUF_FLAG_FRAME_END) { int width, height, i; - MagickBooleanType status; + int status; MagickWand *wand; uint8_t *img_buf, *img_buf_ptr; yuv_planes_t yuv_planes; @@ -101,7 +110,7 @@ static void image_decode_data (video_decoder_t *this_gen, buf_element_t *buf) { status = MagickReadImageBlob(wand, this->image, this->index); this->index = 0; - if (status == MagickFalse) { + if (!status) { DestroyMagickWand(wand); lprintf("error loading image\n"); return; diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c index 6f5653cb9..ec8af4637 100644 --- a/src/xine-engine/load_plugins.c +++ b/src/xine-engine/load_plugins.c @@ -493,7 +493,7 @@ static void _register_plugins_internal(xine_t *this, plugin_file_t *file, while ( info && info->type != PLUGIN_NONE ) { - if (file) + if (file && file->filename) xine_log (this, XINE_LOG_PLUGIN, _("load_plugins: plugin %s found\n"), file->filename); else |