diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-22 05:40:03 +0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-22 05:40:03 +0300 |
| commit | c68a3ab96ec0497ae2d627ddd30c61737d18173e (patch) | |
| tree | 5176f02ac79027e41655aa4c67a16913675461c6 /libavcodec/error_resilience.c | |
| parent | b48ed00403603f5d850eaa7b3e2fcda9ef98fb1c (diff) | |
| parent | 7b917041184874e7d7cba4450813de7e0bb28a33 (diff) | |
Merge commit '7b917041184874e7d7cba4450813de7e0bb28a33'
* commit '7b917041184874e7d7cba4450813de7e0bb28a33':
lavc: Drop deprecated VDPAU codec capability
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/error_resilience.c')
| -rw-r--r-- | libavcodec/error_resilience.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index 5364940e94..0c7f29d171 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -814,9 +814,6 @@ 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 ) |