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/h264_picture.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/h264_picture.c')
-rw-r--r-- | libavcodec/h264_picture.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/libavcodec/h264_picture.c b/libavcodec/h264_picture.c index 99d9f9075c..30987d3145 100644 --- a/libavcodec/h264_picture.c +++ b/libavcodec/h264_picture.c @@ -152,12 +152,6 @@ int ff_h264_field_end(H264Context *h, H264SliceContext *sl, int in_setup) int err = 0; h->mb_y = 0; -#if FF_API_CAP_VDPAU - if (CONFIG_H264_VDPAU_DECODER && - h->avctx->codec->capabilities & AV_CODEC_CAP_HWACCEL_VDPAU) - ff_vdpau_h264_set_reference_frames(h); -#endif - if (in_setup || !(avctx->active_thread_type & FF_THREAD_FRAME)) { if (!h->droppable) { err = ff_h264_execute_ref_pic_marking(h); @@ -175,12 +169,6 @@ int ff_h264_field_end(H264Context *h, H264SliceContext *sl, int in_setup) "hardware accelerator failed to decode picture\n"); } -#if FF_API_CAP_VDPAU - if (CONFIG_H264_VDPAU_DECODER && - h->avctx->codec->capabilities & AV_CODEC_CAP_HWACCEL_VDPAU) - ff_vdpau_h264_picture_complete(h); -#endif - if (!in_setup && !h->droppable) ff_thread_report_progress(&h->cur_pic_ptr->tf, INT_MAX, h->picture_structure == PICT_BOTTOM_FIELD); |