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/mpegpicture.c | |
| parent | b48ed00403603f5d850eaa7b3e2fcda9ef98fb1c (diff) | |
| parent | 7b917041184874e7d7cba4450813de7e0bb28a33 (diff) | |
| download | ffmpeg-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/mpegpicture.c')
| -rw-r--r-- | libavcodec/mpegpicture.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libavcodec/mpegpicture.c b/libavcodec/mpegpicture.c index 53fb35b4bd..9811a778b7 100644 --- a/libavcodec/mpegpicture.c +++ b/libavcodec/mpegpicture.c @@ -58,11 +58,7 @@ int ff_mpeg_framesize_alloc(AVCodecContext *avctx, MotionEstContext *me, { int alloc_size = FFALIGN(FFABS(linesize) + 64, 32); - if (avctx->hwaccel -#if FF_API_CAP_VDPAU - || avctx->codec->capabilities & AV_CODEC_CAP_HWACCEL_VDPAU -#endif - ) + if (avctx->hwaccel) return 0; if (linesize < 24) { |