Fix VDPAU decoders, regression since f2f99f07.

3ea0d9c8 · Carl Eugen Hoyos · 154cee92 · 3ea0d9c8
Commit 3ea0d9c8 authored May 30, 2014 by Carl Eugen Hoyos
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

utils.c libavcodec/utils.c +2 -1

No files found.
--- 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;