@@ -139,11 +139,11 @@ int ff_vdpau_common_start_frame(struct vdpau_picture_context *pic_ctx,

 int ff_vdpau_common_end_frame(AVCodecContext *avctx, AVFrame *frame,

                               struct vdpau_picture_context *pic_ctx)

 {

-    AVVDPAUContext *hwctx = avctx->hwaccel_context;

+    VDPAUContext *vdctx = avctx->internal->hwaccel_priv_data;

     VdpVideoSurface surf = ff_vdpau_get_surface_id(frame);

     VdpStatus status;

-    status = hwctx->render(hwctx->decoder, surf, (void *)&pic_ctx->info,

+    status = vdctx->render(vdctx->decoder, surf, (void *)&pic_ctx->info,

                            pic_ctx->bitstream_buffers_used,

                            pic_ctx->bitstream_buffers);

@@ -24,6 +24,7 @@

 #include <vdpau/vdpau.h>

 #include "avcodec.h"

+#include "internal.h"

 #include "h264.h"

 #include "mpegutils.h"

 #include "vdpau.h"

@@ -202,6 +203,32 @@ static int vdpau_h264_end_frame(AVCodecContext *avctx)

     return 0;

 }

+static int vdpau_h264_init(AVCodecContext *avctx)

+{

+    VdpDecoderProfile profile;

+    uint32_t level = avctx->level;

+

+    switch (avctx->profile & ~FF_PROFILE_H264_INTRA) {

+    case FF_PROFILE_H264_CONSTRAINED_BASELINE:

+    case FF_PROFILE_H264_BASELINE:

+        profile = VDP_DECODER_PROFILE_H264_BASELINE;

+        break;

+    case FF_PROFILE_H264_MAIN:

+        profile = VDP_DECODER_PROFILE_H264_MAIN;

+        break;

+    case FF_PROFILE_H264_HIGH:

+        profile = VDP_DECODER_PROFILE_H264_HIGH;

+        break;

+    default:

+        return AVERROR(ENOTSUP);

+    }

+

+    if ((avctx->profile & FF_PROFILE_H264_INTRA) && avctx->level == 11)

+        level = VDP_DECODER_LEVEL_H264_1b;

+

+    return ff_vdpau_common_init(avctx, profile, level);

+}

+

 AVHWAccel ff_h264_vdpau_hwaccel = {

     .name           = "h264_vdpau",

     .type           = AVMEDIA_TYPE_VIDEO,

@@ -211,4 +238,7 @@ AVHWAccel ff_h264_vdpau_hwaccel = {

     .end_frame      = vdpau_h264_end_frame,

     .decode_slice   = vdpau_h264_decode_slice,

     .frame_priv_data_size = sizeof(struct vdpau_picture_context),

+    .init           = vdpau_h264_init,

+    .uninit         = ff_vdpau_common_uninit,

+    .priv_data_size = sizeof(VDPAUContext),

 };

@@ -95,6 +95,12 @@ static int vdpau_mpeg_decode_slice(AVCodecContext *avctx,

 }

 #if CONFIG_MPEG1_VDPAU_HWACCEL

+static int vdpau_mpeg1_init(AVCodecContext *avctx)

+{

+    return ff_vdpau_common_init(avctx, VDP_DECODER_PROFILE_MPEG1,

+                                VDP_DECODER_LEVEL_MPEG1_NA);

+}

+

 AVHWAccel ff_mpeg1_vdpau_hwaccel = {

     .name           = "mpeg1_vdpau",

     .type           = AVMEDIA_TYPE_VIDEO,

@@ -104,10 +110,31 @@ AVHWAccel ff_mpeg1_vdpau_hwaccel = {

     .end_frame      = ff_vdpau_mpeg_end_frame,

     .decode_slice   = vdpau_mpeg_decode_slice,

     .frame_priv_data_size = sizeof(struct vdpau_picture_context),

+    .init           = vdpau_mpeg1_init,

+    .uninit         = ff_vdpau_common_uninit,

+    .priv_data_size = sizeof(VDPAUContext),

 };

 #endif

 #if CONFIG_MPEG2_VDPAU_HWACCEL

+static int vdpau_mpeg2_init(AVCodecContext *avctx)

+{

+    VdpDecoderProfile profile;

+

+    switch (avctx->profile) {

+    case FF_PROFILE_MPEG2_MAIN:

+        profile = VDP_DECODER_PROFILE_MPEG2_MAIN;

+        break;

+    case FF_PROFILE_MPEG2_SIMPLE:

+        profile = VDP_DECODER_PROFILE_MPEG2_SIMPLE;

+        break;

+    default:

+        return AVERROR(EINVAL);

+    }

+

+    return ff_vdpau_common_init(avctx, profile, VDP_DECODER_LEVEL_MPEG2_HL);

+}

+

 AVHWAccel ff_mpeg2_vdpau_hwaccel = {

     .name           = "mpeg2_vdpau",

     .type           = AVMEDIA_TYPE_VIDEO,

@@ -117,5 +144,8 @@ AVHWAccel ff_mpeg2_vdpau_hwaccel = {

     .end_frame      = ff_vdpau_mpeg_end_frame,

     .decode_slice   = vdpau_mpeg_decode_slice,

     .frame_priv_data_size = sizeof(struct vdpau_picture_context),

+    .init           = vdpau_mpeg2_init,

+    .uninit         = ff_vdpau_common_uninit,

+    .priv_data_size = sizeof(VDPAUContext),

 };

 #endif

@@ -89,6 +89,12 @@ static int vdpau_mpeg4_decode_slice(av_unused AVCodecContext *avctx,

 }

 #if CONFIG_H263_VDPAU_HWACCEL

+static int vdpau_h263_init(AVCodecContext *avctx)

+{

+    return ff_vdpau_common_init(avctx, VDP_DECODER_PROFILE_MPEG4_PART2_ASP,

+                                VDP_DECODER_LEVEL_MPEG4_PART2_ASP_L5);

+}

+

 AVHWAccel ff_h263_vdpau_hwaccel = {

     .name           = "h263_vdpau",

     .type           = AVMEDIA_TYPE_VIDEO,

@@ -98,10 +104,31 @@ AVHWAccel ff_h263_vdpau_hwaccel = {

     .end_frame      = ff_vdpau_mpeg_end_frame,

     .decode_slice   = vdpau_mpeg4_decode_slice,

     .frame_priv_data_size = sizeof(struct vdpau_picture_context),

+    .init           = vdpau_h263_init,

+    .uninit         = ff_vdpau_common_uninit,

+    .priv_data_size = sizeof(VDPAUContext),

 };

 #endif

 #if CONFIG_MPEG4_VDPAU_HWACCEL

+static int vdpau_mpeg4_init(AVCodecContext *avctx)

+{

+    VdpDecoderProfile profile;

+

+    switch (avctx->profile) {

+    case FF_PROFILE_MPEG4_SIMPLE:

+        profile = VDP_DECODER_PROFILE_MPEG4_PART2_SP;

+        break;

+    case FF_PROFILE_MPEG4_ADVANCED_SIMPLE:

+        profile = VDP_DECODER_PROFILE_MPEG4_PART2_ASP;

+        break;

+    default:

+        return AVERROR(ENOTSUP);

+    }

+

+    return ff_vdpau_common_init(avctx, profile, avctx->level);

+}

+

 AVHWAccel ff_mpeg4_vdpau_hwaccel = {

     .name           = "mpeg4_vdpau",

     .type           = AVMEDIA_TYPE_VIDEO,

@@ -111,5 +138,8 @@ AVHWAccel ff_mpeg4_vdpau_hwaccel = {

     .end_frame      = ff_vdpau_mpeg_end_frame,

     .decode_slice   = vdpau_mpeg4_decode_slice,

     .frame_priv_data_size = sizeof(struct vdpau_picture_context),

+    .init           = vdpau_mpeg4_init,

+    .uninit         = ff_vdpau_common_uninit,

+    .priv_data_size = sizeof(VDPAUContext),

 };

 #endif

@@ -109,6 +109,27 @@ static int vdpau_vc1_decode_slice(AVCodecContext *avctx,

     return 0;

 }

+static int vdpau_vc1_init(AVCodecContext *avctx)

+{

+    VdpDecoderProfile profile;

+

+    switch (avctx->profile) {

+    case FF_PROFILE_VC1_SIMPLE:

+        profile = VDP_DECODER_PROFILE_VC1_SIMPLE;

+        break;

+    case FF_PROFILE_VC1_MAIN:

+        profile = VDP_DECODER_PROFILE_VC1_MAIN;

+        break;

+    case FF_PROFILE_VC1_ADVANCED:

+        profile = VDP_DECODER_PROFILE_VC1_ADVANCED;

+        break;

+    default:

+        return AVERROR(ENOTSUP);

+    }

+

+    return ff_vdpau_common_init(avctx, profile, avctx->level);

+}

+

 #if CONFIG_WMV3_VDPAU_HWACCEL

 AVHWAccel ff_wmv3_vdpau_hwaccel = {

     .name           = "wm3_vdpau",

@@ -119,6 +140,9 @@ AVHWAccel ff_wmv3_vdpau_hwaccel = {

     .end_frame      = ff_vdpau_mpeg_end_frame,

     .decode_slice   = vdpau_vc1_decode_slice,

     .frame_priv_data_size = sizeof(struct vdpau_picture_context),

+    .init           = vdpau_vc1_init,

+    .uninit         = ff_vdpau_common_uninit,

+    .priv_data_size = sizeof(VDPAUContext),

 };

 #endif

@@ -131,4 +155,7 @@ AVHWAccel ff_vc1_vdpau_hwaccel = {

     .end_frame      = ff_vdpau_mpeg_end_frame,

     .decode_slice   = vdpau_vc1_decode_slice,

     .frame_priv_data_size = sizeof(struct vdpau_picture_context),

+    .init           = vdpau_vc1_init,

+    .uninit         = ff_vdpau_common_uninit,

+    .priv_data_size = sizeof(VDPAUContext),

 };