vda: merge implementation into one file.

[ffmpeg] / libavcodec / old_codec_ids.h

diff --git a/libavcodec/old_codec_ids.h b/libavcodec/old_codec_ids.h
index 25b361098150491a98f7983c3eae3cdec700e39e..c0ac95101fc0d2937846ac8d2389e056a9e2143f 100644 (file)
--- a/libavcodec/old_codec_ids.h
+++ b/libavcodec/old_codec_ids.h
@@ -19,7 +19,6 @@
 #ifndef AVCODEC_OLD_CODEC_IDS_H
 #define AVCODEC_OLD_CODEC_IDS_H
 
-#include "libavutil/attributes.h"
 #include "libavutil/common.h"
 
 /*
@@ -30,8 +29,7 @@
  * Do not add new items to this list. Use the AVCodecID enum instead.
  */
 
-enum CodecID {
-    CODEC_ID_NONE,
+    CODEC_ID_NONE = AV_CODEC_ID_NONE,
 
     /* video codecs */
     CODEC_ID_MPEG1VIDEO,
@@ -395,6 +393,5 @@ enum CodecID {
     CODEC_ID_MPEG4SYSTEMS = 0x20001, /**< _FAKE_ codec to indicate a MPEG-4 Systems
                                 * stream (only used by libavformat) */
     CODEC_ID_FFMETADATA = 0x21000,   ///< Dummy codec for streams containing only metadata information.
-} attribute_deprecated;
 
 #endif /* AVCODEC_OLD_CODEC_IDS_H */