diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-05-30 17:33:37 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-05-30 17:34:26 +0200 |
| commit | 3ea0d9c8a55b832ab6fb34fc9837642858e7b007 (patch) | |
| tree | c1c38c12fdd393d87608b8a7c251ca1b8124616b | |
| parent | 154cee9292840295bff07e31ebd92c8296d8aa2d (diff) | |
| download | ffmpeg-3ea0d9c8a55b832ab6fb34fc9837642858e7b007.tar.gz | |
Fix VDPAU decoders, regression since f2f99f07.
| -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; |