Merge commit '5edded9df31bc4712a023f89941b4c278f1bd6f5'

[ffmpeg] / libavcodec / mpegpicture.c

diff --git a/libavcodec/mpegpicture.c b/libavcodec/mpegpicture.c
index 53fb35b4bdb49480f7f374b4b9b30f2b24436e27..9811a778b75e7640d6c27c217499c7552b20129e 100644 (file)
--- 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) {