diff options
| author | Mark Thompson <sw@jkqxz.net> | 2016-09-12 22:37:20 +0100 |
|---|---|---|
| committer | Mark Thompson <sw@jkqxz.net> | 2016-09-14 20:48:36 +0100 |
| commit | 09a145b3c837273b1379321e44386a3233156e75 (patch) | |
| tree | 30f1cda4fa1db0a111ad5484881d5a9325ccfd17 /libavutil | |
| parent | de452e503734ebb0fdbce86e9d16693b3530fad3 (diff) | |
hwcontext_vdpau: Remove duplicate definition of GET_CALLBACK
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/hwcontext_vdpau.c | 37 |
1 files changed, 13 insertions, 24 deletions
diff --git a/libavutil/hwcontext_vdpau.c b/libavutil/hwcontext_vdpau.c index 9722c10b87..4860aaabdf 100644 --- a/libavutil/hwcontext_vdpau.c +++ b/libavutil/hwcontext_vdpau.c @@ -127,13 +127,6 @@ static int vdpau_init_pixmfts(AVHWDeviceContext *ctx) return 0; } -static int vdpau_device_init(AVHWDeviceContext *ctx) -{ - AVVDPAUDeviceContext *hwctx = ctx->hwctx; - VDPAUDeviceContext *priv = ctx->internal->priv; - VdpStatus err; - int ret; - #define GET_CALLBACK(id, result) \ do { \ void *tmp; \ @@ -142,15 +135,22 @@ do { av_log(ctx, AV_LOG_ERROR, "Error getting the " #id " callback.\n"); \ return AVERROR_UNKNOWN; \ } \ - priv->result = tmp; \ + result = tmp; \ } while (0) +static int vdpau_device_init(AVHWDeviceContext *ctx) +{ + AVVDPAUDeviceContext *hwctx = ctx->hwctx; + VDPAUDeviceContext *priv = ctx->internal->priv; + VdpStatus err; + int ret; + GET_CALLBACK(VDP_FUNC_ID_VIDEO_SURFACE_QUERY_GET_PUT_BITS_Y_CB_CR_CAPABILITIES, - get_transfer_caps); - GET_CALLBACK(VDP_FUNC_ID_VIDEO_SURFACE_GET_BITS_Y_CB_CR, get_data); - GET_CALLBACK(VDP_FUNC_ID_VIDEO_SURFACE_PUT_BITS_Y_CB_CR, put_data); - GET_CALLBACK(VDP_FUNC_ID_VIDEO_SURFACE_CREATE, surf_create); - GET_CALLBACK(VDP_FUNC_ID_VIDEO_SURFACE_DESTROY, surf_destroy); + priv->get_transfer_caps); + GET_CALLBACK(VDP_FUNC_ID_VIDEO_SURFACE_GET_BITS_Y_CB_CR, priv->get_data); + GET_CALLBACK(VDP_FUNC_ID_VIDEO_SURFACE_PUT_BITS_Y_CB_CR, priv->put_data); + GET_CALLBACK(VDP_FUNC_ID_VIDEO_SURFACE_CREATE, priv->surf_create); + GET_CALLBACK(VDP_FUNC_ID_VIDEO_SURFACE_DESTROY, priv->surf_destroy); ret = vdpau_init_pixmfts(ctx); if (ret < 0) { @@ -444,17 +444,6 @@ static int vdpau_device_create(AVHWDeviceContext *ctx, const char *device, return AVERROR_UNKNOWN; } -#define GET_CALLBACK(id, result) \ -do { \ - void *tmp; \ - err = hwctx->get_proc_address(hwctx->device, id, &tmp); \ - if (err != VDP_STATUS_OK) { \ - av_log(ctx, AV_LOG_ERROR, "Error getting the " #id " callback.\n"); \ - return AVERROR_UNKNOWN; \ - } \ - result = tmp; \ -} while (0) - GET_CALLBACK(VDP_FUNC_ID_GET_INFORMATION_STRING, get_information_string); GET_CALLBACK(VDP_FUNC_ID_DEVICE_DESTROY, priv->device_destroy); |