From ad0c9f2d5d81e22207c6ccecc426bf7306acc327 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Mon, 8 Oct 2012 07:50:14 +0200 Subject: lavc: move AVFrame.hwaccel_picture_private to Picture. This field is private and should not be present in a public struct. It is only used in DXVA with mpegvideo-based decoders currently. --- libavcodec/dxva2_vc1.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libavcodec/dxva2_vc1.c') diff --git a/libavcodec/dxva2_vc1.c b/libavcodec/dxva2_vc1.c index 106c8dae01..4af3ce8127 100644 --- a/libavcodec/dxva2_vc1.c +++ b/libavcodec/dxva2_vc1.c @@ -162,7 +162,7 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx, const VC1Context *v = avctx->priv_data; struct dxva_context *ctx = avctx->hwaccel_context; const MpegEncContext *s = &v->s; - struct dxva2_picture_context *ctx_pic = s->current_picture_ptr->f.hwaccel_picture_private; + struct dxva2_picture_context *ctx_pic = s->current_picture_ptr->hwaccel_picture_private; DXVA_SliceInfo *slice = &ctx_pic->si; @@ -214,7 +214,7 @@ static int dxva2_vc1_start_frame(AVCodecContext *avctx, { const VC1Context *v = avctx->priv_data; struct dxva_context *ctx = avctx->hwaccel_context; - struct dxva2_picture_context *ctx_pic = v->s.current_picture_ptr->f.hwaccel_picture_private; + struct dxva2_picture_context *ctx_pic = v->s.current_picture_ptr->hwaccel_picture_private; if (!ctx->decoder || !ctx->cfg || ctx->surface_count <= 0) return -1; @@ -233,7 +233,7 @@ static int dxva2_vc1_decode_slice(AVCodecContext *avctx, { const VC1Context *v = avctx->priv_data; const Picture *current_picture = v->s.current_picture_ptr; - struct dxva2_picture_context *ctx_pic = current_picture->f.hwaccel_picture_private; + struct dxva2_picture_context *ctx_pic = current_picture->hwaccel_picture_private; if (ctx_pic->bitstream_size > 0) return -1; @@ -254,7 +254,7 @@ static int dxva2_vc1_decode_slice(AVCodecContext *avctx, static int dxva2_vc1_end_frame(AVCodecContext *avctx) { VC1Context *v = avctx->priv_data; - struct dxva2_picture_context *ctx_pic = v->s.current_picture_ptr->f.hwaccel_picture_private; + struct dxva2_picture_context *ctx_pic = v->s.current_picture_ptr->hwaccel_picture_private; int ret; if (ctx_pic->bitstream_size <= 0) -- cgit v1.2.3