[MPlayer-cvslog] r22037 - trunk/libmpdemux/demux_gif.c

[reimar]

Author: reimar
Date: Sun Jan 28 10:53:42 2007
New Revision: 22037

Modified:
   trunk/libmpdemux/demux_gif.c

Log:
Set sh_video->bih->biWidth properly, fixes decoding after latest dec_video.c change


Modified: trunk/libmpdemux/demux_gif.c
==============================================================================
--- trunk/libmpdemux/demux_gif.c	(original)
+++ trunk/libmpdemux/demux_gif.c	Sun Jan 28 10:53:42 2007
@@ -247,9 +247,6 @@
   // video_read_properties() will choke
   sh_video->ds = demuxer->video;
 
-  sh_video->disp_w = (uint16_t)gif->SWidth;
-  sh_video->disp_h = (uint16_t)gif->SHeight;
-
   sh_video->format = mmioFOURCC(8, 'R', 'G', 'B');
   
   sh_video->fps = 5.0f;
@@ -257,11 +254,11 @@
   
   sh_video->bih = malloc(sizeof(BITMAPINFOHEADER) + (256 * 4));
   sh_video->bih->biCompression = sh_video->format;
+  sh_video->bih->biWidth = priv->w = (uint16_t)gif->SWidth;
+  sh_video->bih->biHeight = priv->h = (uint16_t)gif->SHeight;
   sh_video->bih->biBitCount = 8;
   sh_video->bih->biPlanes = 2;
   priv->palette = (unsigned char *)(sh_video->bih + 1);
-  priv->w = sh_video->disp_w;
-  priv->h = sh_video->disp_h;
   priv->refimg = malloc(priv->w * priv->h);
   
   priv->gif = gif;