Merge commit '89ac99ba5f2dc9f69ad3bc294753930eb0b3e4a4'

* commit '89ac99ba5f2dc9f69ad3bc294753930eb0b3e4a4':
  vdpau: pass codec-specific parameters from hwaccel

Conflicts:
	libavcodec/vdpau.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/vdpau.c
index 4fe486bce63edb3a1a0be4cebe2a9dc07b959012,ed8fd7f0e7d0e067bf9944d4ab54041135231c70..316281457e0f38205783cfb7161896d2eb990e08
--- 1/libavcodec/vdpau.c
--- 2/libavcodec/vdpau.c
+++ b/libavcodec/vdpau.c
@@@ -146,24 -139,11 +146,25 @@@ int ff_vdpau_common_start_frame(struct 
  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;
  
-     status = hwctx->render(hwctx->decoder, surf, (void *)&pic_ctx->info,
 +#if FF_API_BUFS_VDPAU
 +FF_DISABLE_DEPRECATION_WARNINGS
 +    hwctx->info = pic_ctx->info;
 +    hwctx->bitstream_buffers = pic_ctx->bitstream_buffers;
 +    hwctx->bitstream_buffers_used = pic_ctx->bitstream_buffers_used;
 +    hwctx->bitstream_buffers_allocated = pic_ctx->bitstream_buffers_allocated;
 +FF_ENABLE_DEPRECATION_WARNINGS
 +#endif
 +
 +    if (!hwctx->render) {
 +        status = hwctx->render2(avctx, frame, (void *)&pic_ctx->info,
 +                                pic_ctx->bitstream_buffers_used, pic_ctx->bitstream_buffers);
 +    } else
+     status = vdctx->render(vdctx->decoder, surf, (void *)&pic_ctx->info,
                             pic_ctx->bitstream_buffers_used,
                             pic_ctx->bitstream_buffers);
  

diff --cc libavcodec/vdpau_h264.c
Simple merge

diff --cc libavcodec/vdpau_mpeg12.c
Simple merge

diff --cc libavcodec/vdpau_mpeg4.c
Simple merge

diff --cc libavcodec/vdpau_vc1.c
Simple merge