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/mpegvideo.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/mpegvideo.c')
| -rw-r--r-- | libavcodec/mpegvideo.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 991c0fd36c..f28f7e886b 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1307,7 +1307,11 @@ int ff_mpv_frame_start(MpegEncContext *s, AVCodecContext *avctx) return -1; } - if (!avctx->hwaccel && !(avctx->codec->capabilities&AV_CODEC_CAP_HWACCEL_VDPAU)) { + if (!avctx->hwaccel +#if FF_API_CAP_VDPAU + && !(avctx->codec->capabilities&AV_CODEC_CAP_HWACCEL_VDPAU) +#endif + ) { 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); @@ -1652,7 +1656,10 @@ 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 - || (avctx->codec->capabilities&AV_CODEC_CAP_HWACCEL_VDPAU)) +#if FF_API_CAP_VDPAU + || (avctx->codec->capabilities&AV_CODEC_CAP_HWACCEL_VDPAU) +#endif + ) return; |