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/h264.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/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index d55231c18c..1b29c8cf16 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1561,9 +1561,11 @@ again: if (h->avctx->hwaccel && (ret = h->avctx->hwaccel->start_frame(h->avctx, buf, buf_size)) < 0) goto end; +#if FF_API_CAP_VDPAU if (CONFIG_H264_VDPAU_DECODER && h->avctx->codec->capabilities & AV_CODEC_CAP_HWACCEL_VDPAU) ff_vdpau_h264_picture_start(h); +#endif } if (sl->redundant_pic_count == 0) { @@ -1573,6 +1575,7 @@ again: consumed); if (ret < 0) goto end; +#if FF_API_CAP_VDPAU } else if (CONFIG_H264_VDPAU_DECODER && h->avctx->codec->capabilities & AV_CODEC_CAP_HWACCEL_VDPAU) { ff_vdpau_add_data_chunk(h->cur_pic_ptr->f->data[0], @@ -1581,6 +1584,7 @@ again: ff_vdpau_add_data_chunk(h->cur_pic_ptr->f->data[0], &buf[buf_index - consumed], consumed); +#endif } else context_count++; } |