diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-06 13:21:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-06 13:21:52 +0200 |
| commit | 0ba887bbf4d99b609247a5447dc63dc2e7550ff5 (patch) | |
| tree | ceeab3191d427df6dfdca35962ec23d6e00d57de /libavcodec/vdpau.c | |
| parent | 8df41976b7cd2e3ae0fd83ec585c886e94734acf (diff) | |
| parent | 89ac99ba5f2dc9f69ad3bc294753930eb0b3e4a4 (diff) | |
| download | ffmpeg-streaming-0ba887bbf4d99b609247a5447dc63dc2e7550ff5.zip ffmpeg-streaming-0ba887bbf4d99b609247a5447dc63dc2e7550ff5.tar.gz | |
Merge commit '89ac99ba5f2dc9f69ad3bc294753930eb0b3e4a4'
* commit '89ac99ba5f2dc9f69ad3bc294753930eb0b3e4a4':
vdpau: pass codec-specific parameters from hwaccel
Conflicts:
libavcodec/vdpau.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vdpau.c')
| -rw-r--r-- | libavcodec/vdpau.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c index 4fe486b..3162814 100644 --- a/libavcodec/vdpau.c +++ b/libavcodec/vdpau.c @@ -146,6 +146,7 @@ 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) { + VDPAUContext *vdctx = avctx->internal->hwaccel_priv_data; AVVDPAUContext *hwctx = avctx->hwaccel_context; VdpVideoSurface surf = ff_vdpau_get_surface_id(frame); VdpStatus status; @@ -163,7 +164,7 @@ FF_ENABLE_DEPRECATION_WARNINGS status = hwctx->render2(avctx, frame, (void *)&pic_ctx->info, pic_ctx->bitstream_buffers_used, pic_ctx->bitstream_buffers); } else - 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); |
