From 3ea0d9c8a55b832ab6fb34fc9837642858e7b007 Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <cehoyos@ag.or.at>
Date: Fri, 30 May 2014 17:33:37 +0200
Subject: Fix VDPAU decoders, regression since f2f99f07.

---
 libavcodec/utils.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'libavcodec/utils.c')

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 75e07dcebc..641d3c4c67 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1161,7 +1161,8 @@ int ff_get_format(AVCodecContext *avctx, const enum AVPixelFormat *fmt)
     av_freep(&avctx->internal->hwaccel_priv_data);
     avctx->hwaccel = NULL;
 
-    if (desc->flags & AV_PIX_FMT_FLAG_HWACCEL) {
+    if (desc->flags & AV_PIX_FMT_FLAG_HWACCEL &&
+        !(avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU)) {
         AVHWAccel *hwaccel;
         int err;
 
-- 
cgit v1.2.3