diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-20 22:38:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-20 22:39:54 +0100 |
| commit | 4d216420bed9d02cf0989d1e986247c1cd2f36c4 (patch) | |
| tree | 9d5316d57b022fea0185f1c17eaa217a82fb51dd /libavcodec/vdpau.c | |
| parent | e98bac82e5152f492ef05deff562abb2c68ec2ca (diff) | |
| parent | 7948a51b5c3d08e1a1173442a7ff72b220def303 (diff) | |
Merge commit '7948a51b5c3d08e1a1173442a7ff72b220def303'
* commit '7948a51b5c3d08e1a1173442a7ff72b220def303':
vdpau: don't assume Picture and H264Picture are the same
Conflicts:
libavcodec/vdpau.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vdpau.c')
| -rw-r--r-- | libavcodec/vdpau.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c index 1a7dae5f85..85923cc3ac 100644 --- a/libavcodec/vdpau.c +++ b/libavcodec/vdpau.c @@ -45,12 +45,10 @@ AVVDPAUContext *av_alloc_vdpaucontext(void) MAKE_ACCESSORS(AVVDPAUContext, vdpau_hwaccel, AVVDPAU_Render2, render2) -int ff_vdpau_common_start_frame(Picture *pic, +int ff_vdpau_common_start_frame(struct vdpau_picture_context *pic_ctx, av_unused const uint8_t *buffer, av_unused uint32_t size) { - struct vdpau_picture_context *pic_ctx = pic->hwaccel_picture_private; - pic_ctx->bitstream_buffers_allocated = 0; pic_ctx->bitstream_buffers_used = 0; pic_ctx->bitstream_buffers = NULL; @@ -100,9 +98,9 @@ FF_ENABLE_DEPRECATION_WARNINGS } #endif -int ff_vdpau_add_buffer(Picture *pic, const uint8_t *buf, uint32_t size) +int ff_vdpau_add_buffer(struct vdpau_picture_context *pic_ctx, + const uint8_t *buf, uint32_t size) { - struct vdpau_picture_context *pic_ctx = pic->hwaccel_picture_private; VdpBitstreamBuffer *buffers = pic_ctx->bitstream_buffers; buffers = av_fast_realloc(buffers, &pic_ctx->bitstream_buffers_allocated, |