Commit c3832510 authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard

wineqtdecoder: Fix compilation.

Partially written by Alistair Leslie-Hughes. Signed-off-by: 's avatarZebediah Figura <z.figura12@gmail.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 5ba1c596
...@@ -128,8 +128,6 @@ ...@@ -128,8 +128,6 @@
#include "qtprivate.h" #include "qtprivate.h"
#include "wineqtdecoder_classes.h" #include "wineqtdecoder_classes.h"
extern CLSID CLSID_QTVDecoder;
WINE_DEFAULT_DEBUG_CHANNEL(qtdecoder); WINE_DEFAULT_DEBUG_CHANNEL(qtdecoder);
typedef struct QTVDecoderImpl typedef struct QTVDecoderImpl
...@@ -137,6 +135,8 @@ typedef struct QTVDecoderImpl ...@@ -137,6 +135,8 @@ typedef struct QTVDecoderImpl
struct strmbase_filter filter; struct strmbase_filter filter;
CRITICAL_SECTION stream_cs; CRITICAL_SECTION stream_cs;
AM_MEDIA_TYPE mt;
struct strmbase_source source; struct strmbase_source source;
IUnknown *seeking; IUnknown *seeking;
...@@ -266,7 +266,7 @@ error: ...@@ -266,7 +266,7 @@ error:
This->decodeHR = hr; This->decodeHR = hr;
} }
static HRESULT WINAPI video_decoder_Receive(struct strmbase_sink *iface, IMediaSample *pSample) static HRESULT WINAPI video_decoder_sink_Receive(struct strmbase_sink *iface, IMediaSample *pSample)
{ {
QTVDecoderImpl *This = impl_from_strmbase_filter(iface->pin.filter); QTVDecoderImpl *This = impl_from_strmbase_filter(iface->pin.filter);
HRESULT hr; HRESULT hr;
...@@ -504,7 +504,7 @@ static HRESULT video_decoder_source_get_media_type(struct strmbase_pin *iface, ...@@ -504,7 +504,7 @@ static HRESULT video_decoder_source_get_media_type(struct strmbase_pin *iface,
return S_OK; return S_OK;
} }
static HRESULT WINAPI video_decoder_DecideBufferSize(struct strmbase_source *iface, static HRESULT WINAPI video_decoder_source_DecideBufferSize(struct strmbase_source *iface,
IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest) IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest)
{ {
QTVDecoderImpl *This = impl_from_strmbase_filter(iface->pin.filter); QTVDecoderImpl *This = impl_from_strmbase_filter(iface->pin.filter);
...@@ -590,7 +590,7 @@ static HRESULT video_decoder_init_stream(struct strmbase_filter *iface) ...@@ -590,7 +590,7 @@ static HRESULT video_decoder_init_stream(struct strmbase_filter *iface)
static HRESULT video_decoder_cleanup_stream(struct strmbase_filter *iface) static HRESULT video_decoder_cleanup_stream(struct strmbase_filter *iface)
{ {
QTVDecoderImpl* This = impl_from_TransformFilter(pTransformFilter); QTVDecoderImpl* This = impl_from_strmbase_filter(iface);
if (This->decompressionSession) if (This->decompressionSession)
ICMDecompressionSessionRelease(This->decompressionSession); ICMDecompressionSessionRelease(This->decompressionSession);
...@@ -611,6 +611,7 @@ HRESULT video_decoder_create(IUnknown *outer, IUnknown **out) ...@@ -611,6 +611,7 @@ HRESULT video_decoder_create(IUnknown *outer, IUnknown **out)
{ {
QTVDecoderImpl *object; QTVDecoderImpl *object;
HRESULT hr; HRESULT hr;
ISeekingPassThru *passthrough;
if (!(object = calloc(1, sizeof(*object)))) if (!(object = calloc(1, sizeof(*object))))
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
...@@ -640,6 +641,6 @@ HRESULT video_decoder_create(IUnknown *outer, IUnknown **out) ...@@ -640,6 +641,6 @@ HRESULT video_decoder_create(IUnknown *outer, IUnknown **out)
ISeekingPassThru_Release(passthrough); ISeekingPassThru_Release(passthrough);
TRACE("Created video decoder %p.\n", object); TRACE("Created video decoder %p.\n", object);
*out = &object->tf.filter.IUnknown_inner; *out = &object->filter.IUnknown_inner;
return S_OK; return S_OK;
} }
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