diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-23 16:19:38 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-23 16:19:38 -0300 |
| commit | b79a7da36faa6bb5914b04800b548e99eb3b81ca (patch) | |
| tree | 517d15684e3fcccd66b42b75ff94030e4843cfe3 /libavcodec/libxvid.c | |
| parent | 6e69525e6984d51165de0b17b796bbc29f9dd6e7 (diff) | |
| parent | bb45d11282d93af0e8d4c8fd6bc6405f7439a940 (diff) | |
Merge commit 'bb45d11282d93af0e8d4c8fd6bc6405f7439a940'
* commit 'bb45d11282d93af0e8d4c8fd6bc6405f7439a940':
lavc: Drop deprecated codec flags
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/libxvid.c')
| -rw-r--r-- | libavcodec/libxvid.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c index 6dd5d8d7a2..d76264d517 100644 --- 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; |