Module: wine Branch: master Commit: 523552fcc3fd88471755abc55598e01094986388 URL: http://source.winehq.org/git/wine.git/?a=commit;h=523552fcc3fd88471755abc555...
Author: Andrew Talbot andrew.talbot@talbotville.com Date: Wed Apr 23 22:13:04 2008 +0100
quartz: Remove unused variables.
---
dlls/quartz/avidec.c | 2 -- dlls/quartz/mpegsplit.c | 5 +---- dlls/quartz/videorenderer.c | 9 --------- 3 files changed, 1 insertions(+), 15 deletions(-)
diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 83d212c..d449662 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -70,7 +70,6 @@ static HRESULT AVIDec_ProcessBegin(TransformFilterImpl* pTransformFilter) static HRESULT AVIDec_ProcessSampleData(TransformFilterImpl* pTransformFilter, IMediaSample *pSample) { AVIDecImpl* This = (AVIDecImpl*)pTransformFilter; - VIDEOINFOHEADER* format; AM_MEDIA_TYPE amt; HRESULT hr; DWORD res; @@ -96,7 +95,6 @@ static HRESULT AVIDec_ProcessSampleData(TransformFilterImpl* pTransformFilter, I ERR("Unable to retrieve media type\n"); goto error; } - format = (VIDEOINFOHEADER*)amt.pbFormat;
/* Update input size to match sample size */ This->pBihIn->biSizeImage = cbSrcStream; diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 395ce71..eb2cb4b 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -123,7 +123,7 @@ static HRESULT parse_header(BYTE *header, LONGLONG *plen, LONGLONG *pduration) { LONGLONG duration;
- int bitrate_index, freq_index, mode_ext, emphasis, lsf = 1, mpeg1, layer, mode, padding, bitrate, length; + int bitrate_index, freq_index, lsf = 1, mpeg1, layer, padding, bitrate, length;
if (!(header[0] == 0xff && ((header[1]>>5)&0x7) == 0x7 && ((header[1]>>1)&0x3) != 0 && ((header[2]>>4)&0xf) != 0xf && @@ -141,9 +141,6 @@ static HRESULT parse_header(BYTE *header, LONGLONG *plen, LONGLONG *pduration) bitrate_index = ((header[2]>>4)&0xf); freq_index = ((header[2]>>2)&0x3) + (mpeg1?(lsf*3):6); padding = ((header[2]>>1)&0x1); - mode = ((header[3]>>6)&0x3); - mode_ext = ((header[3]>>4)&0x3); - emphasis = ((header[3]>>0)&0x3);
bitrate = tabsel_123[lsf][layer-1][bitrate_index] * 1000; if (!bitrate || layer != 3) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index f49f8fb..97bb825 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -267,16 +267,11 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, { AM_MEDIA_TYPE amt; HRESULT hr = S_OK; - DDSURFACEDESC sdesc; - int width; - int height; - LPBYTE palette = NULL; HDC hDC; BITMAPINFOHEADER *bmiHeader;
TRACE("%p %p %d\n", This, data, size);
- sdesc.dwSize = sizeof(sdesc); hr = IPin_ConnectionMediaType(This->ppPins[0], &amt); if (FAILED(hr)) { ERR("Unable to retrieve media type\n"); @@ -306,10 +301,6 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, TRACE("biCompression = %s\n", debugstr_an((LPSTR)&(bmiHeader->biCompression), 4)); TRACE("biSizeImage = %d\n", bmiHeader->biSizeImage);
- width = bmiHeader->biWidth; - height = bmiHeader->biHeight; - palette = ((LPBYTE)bmiHeader) + bmiHeader->biSize; - if (!This->init) { if (!This->WindowPos.right || !This->WindowPos.bottom)