diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 13:22:40 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 13:22:40 +0100 |
commit | 29be9b5301212d29186a05f262a6ce04ddbc168c (patch) | |
tree | 893ee3e5fb5ccf0bbcb751aefb22ad1b3387671b /libavcodec/dxva2.c | |
parent | 2a37e560dccb81328f610c51e74ce6cc53f1a5c7 (diff) | |
download | ffmpeg-29be9b5301212d29186a05f262a6ce04ddbc168c.tar.gz |
avcodec/dxva2: fix pointers after H264Picture
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dxva2.c')
-rw-r--r-- | libavcodec/dxva2.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/dxva2.c b/libavcodec/dxva2.c index 1b29f20816..c1c7681402 100644 --- a/libavcodec/dxva2.c +++ b/libavcodec/dxva2.c @@ -30,15 +30,15 @@ #include "mpegvideo.h" #include "dxva2_internal.h" -void *ff_dxva2_get_surface(const Picture *picture) +void *ff_dxva2_get_surface(const AVFrame *frame) { - return picture->f.data[3]; + return frame->data[3]; } unsigned ff_dxva2_get_surface_index(const struct dxva_context *ctx, - const Picture *picture) + const AVFrame *frame) { - void *surface = ff_dxva2_get_surface(picture); + void *surface = ff_dxva2_get_surface(frame); unsigned i; for (i = 0; i < ctx->surface_count; i++) @@ -91,7 +91,7 @@ int ff_dxva2_commit_buffer(AVCodecContext *avctx, return result; } -int ff_dxva2_common_end_frame(AVCodecContext *avctx, Picture *pic, +int ff_dxva2_common_end_frame(AVCodecContext *avctx, AVFrame *frame, const void *pp, unsigned pp_size, const void *qm, unsigned qm_size, int (*commit_bs_si)(AVCodecContext *, @@ -107,7 +107,7 @@ int ff_dxva2_common_end_frame(AVCodecContext *avctx, Picture *pic, do { hr = IDirectXVideoDecoder_BeginFrame(ctx->decoder, - ff_dxva2_get_surface(pic), + ff_dxva2_get_surface(frame), NULL); if (hr == E_PENDING) av_usleep(2000); |