Commit 24e3bac5 authored by Hendrik Leppkes's avatar Hendrik Leppkes

avcodec: remove deprecated codec id aliases

parent 76cac7ed
...@@ -552,10 +552,6 @@ enum AVCodecID { ...@@ -552,10 +552,6 @@ enum AVCodecID {
AV_CODEC_ID_MPEG4SYSTEMS = 0x20001, /**< _FAKE_ codec to indicate a MPEG-4 Systems AV_CODEC_ID_MPEG4SYSTEMS = 0x20001, /**< _FAKE_ codec to indicate a MPEG-4 Systems
* stream (only used by libavformat) */ * stream (only used by libavformat) */
AV_CODEC_ID_FFMETADATA = 0x21000, ///< Dummy codec for streams containing only metadata information. AV_CODEC_ID_FFMETADATA = 0x21000, ///< Dummy codec for streams containing only metadata information.
#if FF_API_CODEC_ID
#include "old_codec_ids.h"
#endif
}; };
/** /**
......
This diff is collapsed.
...@@ -2873,13 +2873,6 @@ unsigned avcodec_version(void) ...@@ -2873,13 +2873,6 @@ unsigned avcodec_version(void)
av_assert0(AV_CODEC_ID_SRT==94216); av_assert0(AV_CODEC_ID_SRT==94216);
av_assert0(LIBAVCODEC_VERSION_MICRO >= 100); av_assert0(LIBAVCODEC_VERSION_MICRO >= 100);
#if FF_API_CODEC_ID
av_assert0(CODEC_ID_CLLC == AV_CODEC_ID_CLLC);
av_assert0(CODEC_ID_PCM_S8_PLANAR == AV_CODEC_ID_PCM_S8_PLANAR);
av_assert0(CODEC_ID_ADPCM_IMA_APC == AV_CODEC_ID_ADPCM_IMA_APC);
av_assert0(CODEC_ID_ILBC == AV_CODEC_ID_ILBC);
av_assert0(CODEC_ID_SRT == AV_CODEC_ID_SRT);
#endif
return LIBAVCODEC_VERSION_INT; return LIBAVCODEC_VERSION_INT;
} }
......
...@@ -55,9 +55,6 @@ ...@@ -55,9 +55,6 @@
#ifndef FF_API_VIMA_DECODER #ifndef FF_API_VIMA_DECODER
#define FF_API_VIMA_DECODER (LIBAVCODEC_VERSION_MAJOR < 57) #define FF_API_VIMA_DECODER (LIBAVCODEC_VERSION_MAJOR < 57)
#endif #endif
#ifndef FF_API_CODEC_ID
#define FF_API_CODEC_ID (LIBAVCODEC_VERSION_MAJOR < 57)
#endif
#ifndef FF_API_AUDIO_CONVERT #ifndef FF_API_AUDIO_CONVERT
#define FF_API_AUDIO_CONVERT (LIBAVCODEC_VERSION_MAJOR < 57) #define FF_API_AUDIO_CONVERT (LIBAVCODEC_VERSION_MAJOR < 57)
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment