diff options
author | Ronald S. Bultje <rsbultje@gmail.com> | 2015-08-16 19:35:59 -0400 |
---|---|---|
committer | Ronald S. Bultje <rsbultje@gmail.com> | 2015-08-18 15:57:19 -0400 |
commit | 030b5a4f777b59066f1766030db082a53682994d (patch) | |
tree | fa4925411e7246103c96ba9a7c6fae69d273a3ce /libavcodec/error_resilience.c | |
parent | 7a629186ba0481f4aef1d9590d0e55b3bc5f4ed0 (diff) | |
download | ffmpeg-030b5a4f777b59066f1766030db082a53682994d.tar.gz |
lavc: put remaining bits of vdpau-in-decoder under FF_API_CAP_VDPAU.
Diffstat (limited to 'libavcodec/error_resilience.c')
-rw-r--r-- | libavcodec/error_resilience.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index b3b46d1559..2c741a4a16 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -777,7 +777,9 @@ void ff_er_frame_start(ERContext *s) static int er_supported(ERContext *s) { if(s->avctx->hwaccel && s->avctx->hwaccel->decode_slice || +#if FF_API_CAP_VDPAU s->avctx->codec->capabilities&AV_CODEC_CAP_HWACCEL_VDPAU || +#endif !s->cur_pic.f || s->cur_pic.field_picture ) |