diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-08 19:35:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-08 19:35:37 +0100 |
| commit | fee484edaff77fc831d4cbbdd259ea0948103f86 (patch) | |
| tree | b8b7ba5d51cbb3da036a9e28534575aa8419e4ca /libavcodec/dxva2_h264.c | |
| parent | d9d97f9b3374ee740a6f7218aecb0f5d6cec8f57 (diff) | |
| parent | ad0c9f2d5d81e22207c6ccecc426bf7306acc327 (diff) | |
| download | ffmpeg-fee484edaff77fc831d4cbbdd259ea0948103f86.tar.gz | |
Merge commit 'ad0c9f2d5d81e22207c6ccecc426bf7306acc327'
* commit 'ad0c9f2d5d81e22207c6ccecc426bf7306acc327':
lavc: move AVFrame.hwaccel_picture_private to Picture.
Conflicts:
libavcodec/avcodec.h
libavcodec/mpegvideo.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dxva2_h264.c')
| -rw-r--r-- | libavcodec/dxva2_h264.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/dxva2_h264.c b/libavcodec/dxva2_h264.c index f57ee544a8..d9d7d08248 100644 --- a/libavcodec/dxva2_h264.c +++ b/libavcodec/dxva2_h264.c @@ -278,7 +278,7 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx, const unsigned mb_count = h->mb_width * h->mb_height; struct dxva_context *ctx = avctx->hwaccel_context; const Picture *current_picture = h->cur_pic_ptr; - struct dxva2_picture_context *ctx_pic = current_picture->f.hwaccel_picture_private; + struct dxva2_picture_context *ctx_pic = current_picture->hwaccel_picture_private; DXVA_Slice_H264_Short *slice = NULL; uint8_t *dxva_data, *current, *end; unsigned dxva_size; @@ -373,7 +373,7 @@ static int dxva2_h264_start_frame(AVCodecContext *avctx, { const H264Context *h = avctx->priv_data; struct dxva_context *ctx = avctx->hwaccel_context; - struct dxva2_picture_context *ctx_pic = h->cur_pic_ptr->f.hwaccel_picture_private; + struct dxva2_picture_context *ctx_pic = h->cur_pic_ptr->hwaccel_picture_private; if (!ctx->decoder || !ctx->cfg || ctx->surface_count <= 0) return -1; @@ -398,7 +398,7 @@ static int dxva2_h264_decode_slice(AVCodecContext *avctx, const H264Context *h = avctx->priv_data; struct dxva_context *ctx = avctx->hwaccel_context; const Picture *current_picture = h->cur_pic_ptr; - struct dxva2_picture_context *ctx_pic = current_picture->f.hwaccel_picture_private; + struct dxva2_picture_context *ctx_pic = current_picture->hwaccel_picture_private; unsigned position; if (ctx_pic->slice_count >= MAX_SLICES) @@ -426,7 +426,7 @@ static int dxva2_h264_end_frame(AVCodecContext *avctx) { H264Context *h = avctx->priv_data; struct dxva2_picture_context *ctx_pic = - h->cur_pic_ptr->f.hwaccel_picture_private; + h->cur_pic_ptr->hwaccel_picture_private; int ret; if (ctx_pic->slice_count <= 0 || ctx_pic->bitstream_size <= 0) |