[FFmpeg-cvslog] avcodec: Drop deprecated VIMA codecid

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Oct 21 23:55:23 2017 -0300| [5ad1a989b67dedf801abc78ad7dc86ff573c1406] | committer: James Almer

avcodec: Drop deprecated VIMA codecid

Deprecated in 02/2015.

Signed-off-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5ad1a989b67dedf801abc78ad7dc86ff573c1406
---

 libavcodec/avcodec.h | 3 ---
 libavcodec/version.h | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 076332b6f1..dfbb61ca88 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -520,9 +520,6 @@ enum AVCodecID {
     AV_CODEC_ID_ADPCM_G722,
     AV_CODEC_ID_ADPCM_IMA_APC,
     AV_CODEC_ID_ADPCM_VIMA,
-#if FF_API_VIMA_DECODER
-    AV_CODEC_ID_VIMA = AV_CODEC_ID_ADPCM_VIMA,
-#endif
 
     AV_CODEC_ID_ADPCM_AFC = 0x11800,
     AV_CODEC_ID_ADPCM_IMA_OKI,
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 55b7cfff11..9040dae8fb 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -51,9 +51,6 @@
  * at once through the bump. This improves the git bisect-ability of the change.
  */
 
-#ifndef FF_API_VIMA_DECODER
-#define FF_API_VIMA_DECODER     (LIBAVCODEC_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_LOWRES
 #define FF_API_LOWRES            (LIBAVCODEC_VERSION_MAJOR < 59)
 #endif