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/mpegvideo.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/mpegvideo.c')
| -rw-r--r-- | libavcodec/mpegvideo.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index c4089972f0..75e6742995 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1311,11 +1311,7 @@ int ff_mpv_frame_start(MpegEncContext *s, AVCodecContext *avctx) return -1; } - if (!avctx->hwaccel -#if FF_API_CAP_VDPAU - && !(avctx->codec->capabilities&AV_CODEC_CAP_HWACCEL_VDPAU) -#endif - ) { + if (!avctx->hwaccel) { for(i=0; i<avctx->height; i++) memset(s->last_picture_ptr->f->data[0] + s->last_picture_ptr->f->linesize[0]*i, 0x80, avctx->width); @@ -1661,11 +1657,7 @@ void ff_print_debug_info2(AVCodecContext *avctx, AVFrame *pict, uint8_t *mbskip_ } /* TODO: export all the following to make them accessible for users (and filters) */ - if (avctx->hwaccel || !mbtype_table -#if FF_API_CAP_VDPAU - || (avctx->codec->capabilities&AV_CODEC_CAP_HWACCEL_VDPAU) -#endif - ) + if (avctx->hwaccel || !mbtype_table) return; |