Author: al
Date: Sun Oct 5 04:39:08 2014
New Revision: 37293
Log:
Fix build for GIFLIB versions 5.1 and higher
Modified:
trunk/libmpdemux/demux_gif.c
trunk/libvo/vo_gif89a.c
Modified: trunk/libmpdemux/demux_gif.c
==============================================================================
--- trunk/libmpdemux/demux_gif.c Fri Oct 3 16:10:35 2014 (r37292)
+++ trunk/libmpdemux/demux_gif.c Sun Oct 5 04:39:08 2014 (r37293)
@@ -49,7 +49,10 @@ typedef struct {
#define DGifOpen(a, b) DGifOpen(a, b, NULL)
#define DGifOpenFileHandle(a) DGifOpenFileHandle(a, NULL)
#define GifError() (gif ? gif->Error : 0)
-#define GifErrorString() GifErrorString(gif->Error)
+#define GifErrorString() GifErrorString(err)
+#if defined GIFLIB_MINOR && GIFLIB_MINOR >= 1
+#define DGifCloseFile(a) DGifCloseFile(a, NULL)
+#endif
#endif
/* >= 4.2 prior GIFLIB did not have MAJOR/MINOR defines */
@@ -325,7 +328,7 @@ static void demux_close_gif(demuxer_t* d
gif_priv_t *priv = demuxer->priv;
if (!priv) return;
if (priv->gif && DGifCloseFile(priv->gif) == GIF_ERROR)
- print_gif_error(priv->gif);
+ print_gif_error(NULL);
free(priv->refimg);
free(priv);
}
Modified: trunk/libvo/vo_gif89a.c
==============================================================================
--- trunk/libvo/vo_gif89a.c Fri Oct 3 16:10:35 2014 (r37292)
+++ trunk/libvo/vo_gif89a.c Sun Oct 5 04:39:08 2014 (r37293)
@@ -75,6 +75,9 @@ const LIBVO_EXTERN(gif89a)
#define MakeMapObject GifMakeMapObject
#define FreeMapObject GifFreeMapObject
#define QuantizeBuffer GifQuantizeBuffer
+#if defined GIFLIB_MINOR && GIFLIB_MINOR >= 1
+#define EGifCloseFile(a) EGifCloseFile(a, NULL)
+#endif
#endif
// how many frames per second we are aiming for during output.
