avcodec: Drop deprecated VIMA codecid

Deprecated in 02/2015.

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

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 076332b6f1567404a078d1190092fe4eb9c6335a..dfbb61ca88d30c2658ed39efbef20ce1a0a4f469 100644 (file)
--- 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 55b7cfff118b8a600f3b6afcb7dbf2e43c11f305..9040dae8fb04fb2b234386aa8814dd66c7419b2f 100644 (file)
--- 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