Merge commit 'd8ebb6157d12183ed3fc987cd2ba18b404758828'

[ffmpeg] / libavcodec / mpegpicture.c

diff --git a/libavcodec/mpegpicture.c b/libavcodec/mpegpicture.c
index 49cd6f0d0c124bd0b3e17a1f054ecd4d1584cab3..bb822b6c096fe187f0a3245492524f98de193c54 100644 (file)
--- a/libavcodec/mpegpicture.c
+++ b/libavcodec/mpegpicture.c
@@ -58,7 +58,11 @@ int ff_mpeg_framesize_alloc(AVCodecContext *avctx, MotionEstContext *me,
 {
     int alloc_size = FFALIGN(FFABS(linesize) + 64, 32);
 
-    if (avctx->hwaccel || avctx->codec->capabilities & AV_CODEC_CAP_HWACCEL_VDPAU)
+    if (avctx->hwaccel
+#if FF_API_CAP_VDPAU
+        || avctx->codec->capabilities & AV_CODEC_CAP_HWACCEL_VDPAU
+#endif
+        )
         return 0;
 
     if (linesize < 24) {