diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-01-28 09:53:42 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-01-28 09:53:42 +0000 |
| commit | c518d68f2561eed5fb3ec8fad55c4d2b346d8d7a (patch) | |
| tree | 39d789df4cf10f3e990998ca7dc5077417cd2eb7 /libmpdemux | |
| parent | edf1fb46d2dc56ddc1f3ddf330a0d81de17f4514 (diff) | |
| download | mpv-c518d68f2561eed5fb3ec8fad55c4d2b346d8d7a.tar.bz2 mpv-c518d68f2561eed5fb3ec8fad55c4d2b346d8d7a.tar.xz | |
Set sh_video->bih->biWidth properly, fixes decoding after latest dec_video.c change
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22037 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_gif.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libmpdemux/demux_gif.c b/libmpdemux/demux_gif.c index b246b6740d..00f5aa2cdb 100644 --- a/libmpdemux/demux_gif.c +++ b/libmpdemux/demux_gif.c @@ -247,9 +247,6 @@ static demuxer_t* demux_open_gif(demuxer_t* demuxer) // 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 @@ static demuxer_t* demux_open_gif(demuxer_t* demuxer) 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; |