From: Steve Lhomme <[email protected]>
---
avtools/avconv_dxva2.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/avtools/avconv_dxva2.c b/avtools/avconv_dxva2.c
index 0edfe55ad9..99f608f30d 100644
--- a/avtools/avconv_dxva2.c
+++ b/avtools/avconv_dxva2.c
@@ -69,7 +69,7 @@ DEFINE_GUID(IID_IDirectXVideoDecoderService,
0xfc51a551,0xd5e7,0x11d9,0xaf,0x55,
static void dxva2_uninit(AVCodecContext *s)
{
InputStream *ist = s->opaque;
- DXVA2Context *ctx = ist->hwaccel_ctx;
+ DXVA_CONTEXT *ctx = ist->hwaccel_ctx;
if (ctx->decoder_service)
IDirectXVideoDecoderService_Release(ctx->decoder_service);
@@ -81,7 +81,7 @@ static int dxva2_alloc(AVCodecContext *s)
{
InputStream *ist = s->opaque;
int loglevel = (ist->hwaccel_id == HWACCEL_AUTO) ? AV_LOG_VERBOSE :
AV_LOG_ERROR;
- DXVA2Context *ctx;
+ DXVA_CONTEXT *ctx;
HANDLE device_handle;
HRESULT hr;
@@ -120,13 +120,13 @@ fail:
static int dxva2_get_decoder_configuration(AVCodecContext *s, const GUID
*device_guid,
const DXVA2_VideoDesc *desc,
- DXVA2_ConfigPictureDecode *config)
+ DXVA_DECODER_CONFIG *config)
{
InputStream *ist = s->opaque;
int loglevel = (ist->hwaccel_id == HWACCEL_AUTO) ? AV_LOG_VERBOSE :
AV_LOG_ERROR;
- DXVA2Context *ctx = ist->hwaccel_ctx;
+ DXVA_CONTEXT *ctx = ist->hwaccel_ctx;
unsigned cfg_count;
- DXVA2_ConfigPictureDecode *cfg_list;
+ DXVA_DECODER_CONFIG *cfg_list;
HRESULT hr;
int ret;
@@ -141,7 +141,7 @@ static int dxva2_get_decoder_configuration(AVCodecContext
*s, const GUID *device
return ret;
}
-static int dxva2_validate_output(IDirectXVideoDecoderService *decoder_service,
GUID guid, D3DFORMAT surface_format)
+static int dxva2_validate_output(DXVA_DECODER_SERVICE decoder_service, GUID
guid, DXVA_SURFACE_FORMAT surface_format)
{
HRESULT hr;
int ret = 0;
@@ -165,15 +165,15 @@ static int dxva2_create_decoder(AVCodecContext *s)
{
InputStream *ist = s->opaque;
int loglevel = (ist->hwaccel_id == HWACCEL_AUTO) ? AV_LOG_VERBOSE :
AV_LOG_ERROR;
- DXVA2Context *ctx = ist->hwaccel_ctx;
- struct dxva_context *dxva_ctx = s->hwaccel_context;
+ DXVA_CONTEXT *ctx = ist->hwaccel_ctx;
+ DXVA_AV_CONTEXT *dxva_ctx = s->hwaccel_context;
GUID *guid_list;
unsigned guid_count;
GUID device_guid;
- const D3DFORMAT surface_format = s->sw_pix_fmt == AV_PIX_FMT_YUV420P10 ?
- MKTAG('P', '0', '1', '0') : MKTAG('N',
'V', '1', '2');
+ const DXVA_SURFACE_FORMAT surface_format = s->sw_pix_fmt ==
AV_PIX_FMT_YUV420P10 ?
+ MKTAG('P', '0', '1', '0') :
MKTAG('N', 'V', '1', '2');
DXVA2_VideoDesc desc = { 0 };
- DXVA2_ConfigPictureDecode config;
+ DXVA_DECODER_CONFIG config;
HRESULT hr;
int ret;
--
2.11.0
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
