[prev in list] [next in list] [prev in thread] [next in thread] 

List:       xine-cvslog
Subject:    [xine-cvs] HG: xine-lib: Merge.
From:       Darren Salt <linux () youmustbejoking ! demon ! co ! uk>
Date:       2009-01-16 17:08:44
Message-ID: c1d5466bb972b8393218.1232124736 () hg ! debian ! org
[Download RAW message or body]

# HG changeset patch
# User Darren Salt <linux@youmustbejoking.demon.co.uk>
# Date 1232124736 0
# Node ID c1d5466bb972b83932189ca180705a537ffe84bc
# Parent  e57f0e4d75ead9f945888efba427d07839b5f721
# Parent  5af94441384e12d2a94d0ba360f6243792cd3928
Merge.

diff -r c1d5466bb972b83932189ca180705a537ffe84bc -r \
                e57f0e4d75ead9f945888efba427d07839b5f721 src/libxinevdec/image.c
--- a/src/libxinevdec/image.c	Fri Jan 16 16:52:16 2009 +0000
+++ b/src/libxinevdec/image.c	Fri Jan 16 15:55:42 2009 +0000
@@ -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;
 

------------------------------------------------------------------------------
This SF.net email is sponsored by:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword
_______________________________________________
Xine-cvslog mailing list
Xine-cvslog@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xine-cvslog


[prev in list] [next in list] [prev in thread] [next in thread]