Merge commit 'c43a96fe16e6a6ea091e64ca271f0788f4a0bea9'

[ffmpeg] / libavcodec / libxvid.c

diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c
index 6dd5d8d7a2b2e89837dd207fb5c76fc1630153cd..d76264d517c9f0fa46165ea532b3058a2ea8774a 100644 (file)
--- a/libavcodec/libxvid.c
+++ b/libavcodec/libxvid.c
@@ -462,11 +462,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
     }
 
     /* Bring in VOL flags from ffmpeg command-line */
-#if FF_API_GMC
-    if (avctx->flags & CODEC_FLAG_GMC)
-        x->gmc = 1;
-#endif
-
     x->vol_flags = 0;
     if (x->gmc) {
         x->vol_flags |= XVID_VOL_GMC;