Skip to content

W
wine-winehq
Commit da0f196c authored by Michael Müller's avatar Michael Müller Committed by Alexandre Julliard
Browse files
Options

avifil32: Correctly handle compressed frames when desired format is specified.

From: Michael Müller <michael@fds-team.de> Signed-off-by: 's avatarVijay Kiran Kamuju <infyquest@gmail.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent a2c10f4d
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 3 deletions
dlls/avifil32/getframe.c
View file @ da0f196c
...@@ -405,8 +405,6 @@ static HRESULT WINAPI IGetFrame_fnSetFormat(IGetFrame *iface, ...@@ -405,8 +405,6 @@ static HRESULT WINAPI IGetFrame_fnSetFormat(IGetFrame *iface,
lpbi->biSize + lpbi->biClrUsed * sizeof(RGBQUAD)); lpbi->biSize + lpbi->biClrUsed * sizeof(RGBQUAD));
if (lpbi->biBitCount <= 8) if (lpbi->biBitCount <= 8)
ICDecompressGetPalette(This->hic, This->lpInFormat, This->lpOutFormat); ICDecompressGetPalette(This->hic, This->lpInFormat, This->lpOutFormat);
return AVIERR_OK;
} else { } else {
if (bBestDisplay) { if (bBestDisplay) {
ICGetDisplayFormat(This->hic, This->lpInFormat, ICGetDisplayFormat(This->hic, This->lpInFormat,
...@@ -416,6 +414,7 @@ static HRESULT WINAPI IGetFrame_fnSetFormat(IGetFrame *iface, ...@@ -416,6 +414,7 @@ static HRESULT WINAPI IGetFrame_fnSetFormat(IGetFrame *iface,
AVIFILE_CloseCompressor(This); AVIFILE_CloseCompressor(This);
return AVIERR_NOCOMPRESSOR; return AVIERR_NOCOMPRESSOR;
} }
}
/* check output format */ /* check output format */
if (This->lpOutFormat->biClrUsed == 0 && if (This->lpOutFormat->biClrUsed == 0 &&
...@@ -473,7 +472,6 @@ static HRESULT WINAPI IGetFrame_fnSetFormat(IGetFrame *iface, ...@@ -473,7 +472,6 @@ static HRESULT WINAPI IGetFrame_fnSetFormat(IGetFrame *iface,
AVIFILE_CloseCompressor(This); AVIFILE_CloseCompressor(This);
return AVIERR_COMPRESSOR; return AVIERR_COMPRESSOR;
}
} }
static const struct IGetFrameVtbl igetframeVtbl = { static const struct IGetFrameVtbl igetframeVtbl = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment