[FFmpeg-cvslog] Fix VDPAU decoders, regression since f2f99f07.

[Carl Eugen Hoyos]

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Fri May 30 17:33:37 2014 +0200| [3ea0d9c8a55b832ab6fb34fc9837642858e7b007] | committer: Carl Eugen Hoyos

Fix VDPAU decoders, regression since f2f99f07.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3ea0d9c8a55b832ab6fb34fc9837642858e7b007
---

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

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 75e07dc..641d3c4 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;