diff options
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/utils.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; |