Merge commit '319424d25c53f82b87187ce03ed984d438f1bee6'

* commit '319424d25c53f82b87187ce03ed984d438f1bee6':
  vdpau: add helper for VDPAU to libav error codes conversion

Conflicts:
	libavcodec/vdpau.c

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

diff --cc libavcodec/vdpau.c
index 0dc5355262fdf3abbc733f0a0d8dbef012265ae9,581eadae36d0cb055879aae7d24de3be61b2bbcb..18d09ae98071cea42f3d7958643a043c2a79aa33
--- 1/libavcodec/vdpau.c
--- 2/libavcodec/vdpau.c
+++ b/libavcodec/vdpau.c
@@@ -38,13 -38,30 +38,37 @@@
   * @{
   */
  
+ static int vdpau_error(VdpStatus status)
+ {
+     switch (status) {
+     case VDP_STATUS_OK:
+         return 0;
+     case VDP_STATUS_NO_IMPLEMENTATION:
+         return AVERROR(ENOSYS);
+     case VDP_STATUS_DISPLAY_PREEMPTED:
+         return AVERROR(EIO);
+     case VDP_STATUS_INVALID_HANDLE:
+         return AVERROR(EBADF);
+     case VDP_STATUS_INVALID_POINTER:
+         return AVERROR(EFAULT);
+     case VDP_STATUS_RESOURCES:
+         return AVERROR(ENOBUFS);
+     case VDP_STATUS_HANDLE_DEVICE_MISMATCH:
+         return AVERROR(EXDEV);
+     case VDP_STATUS_ERROR:
+         return AVERROR(EIO);
+     default:
+         return AVERROR(EINVAL);
+     }
+ }
+ 
 +AVVDPAUContext *av_alloc_vdpaucontext(void)
 +{
 +    return av_vdpau_alloc_context();
 +}
 +
 +MAKE_ACCESSORS(AVVDPAUContext, vdpau_hwaccel, AVVDPAU_Render2, render2)
 +
  int ff_vdpau_common_start_frame(struct vdpau_picture_context *pic_ctx,
                                  av_unused const uint8_t *buffer,
                                  av_unused uint32_t size)