diff options
author | James Almer <jamrial@gmail.com> | 2017-10-21 23:40:03 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-10-21 23:40:03 -0300 |
commit | c68a3ab96ec0497ae2d627ddd30c61737d18173e (patch) | |
tree | 5176f02ac79027e41655aa4c67a16913675461c6 /libavcodec/decode.c | |
parent | b48ed00403603f5d850eaa7b3e2fcda9ef98fb1c (diff) | |
parent | 7b917041184874e7d7cba4450813de7e0bb28a33 (diff) | |
download | ffmpeg-streaming-c68a3ab96ec0497ae2d627ddd30c61737d18173e.zip ffmpeg-streaming-c68a3ab96ec0497ae2d627ddd30c61737d18173e.tar.gz |
Merge commit '7b917041184874e7d7cba4450813de7e0bb28a33'
* commit '7b917041184874e7d7cba4450813de7e0bb28a33':
lavc: Drop deprecated VDPAU codec capability
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/decode.c')
-rw-r--r-- | libavcodec/decode.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 1337ffb..7f08f0e 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1214,10 +1214,6 @@ int ff_get_format(AVCodecContext *avctx, const enum AVPixelFormat *fmt) if (!(desc->flags & AV_PIX_FMT_FLAG_HWACCEL)) break; -#if FF_API_CAP_VDPAU - if (avctx->codec->capabilities&AV_CODEC_CAP_HWACCEL_VDPAU) - break; -#endif if (avctx->hw_frames_ctx) { AVHWFramesContext *hw_frames_ctx = (AVHWFramesContext*)avctx->hw_frames_ctx->data; |