diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-08-08 08:04:56 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-08-10 18:48:40 +0200 |
| commit | 2ff67c909c95903240c30405b0b231ba68f5407a (patch) | |
| tree | 72931b74d3665e3c6136b6f723ad70334881acdf /libavcodec | |
| parent | 33de86db2bda850d97e04c4fd132c223c7249333 (diff) | |
| download | ffmpeg-2ff67c909c95903240c30405b0b231ba68f5407a.tar.gz | |
lavc: fix mixing CODEC_ID/AV_CODEC_ID in C++ code.
C++ does not allow to mix different enums, so e.g. code comparing
ACodecID with CodecID would fail to compile with gcc.
This very evil hack should fix this problem.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 1 | ||||
| -rw-r--r-- | libavcodec/avcodec.h | 11 | ||||
| -rw-r--r-- | libavcodec/old_codec_ids.h | 6 |
3 files changed, 10 insertions, 8 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 655e828cbc..095d09a6eb 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -705,6 +705,7 @@ SKIPHEADERS += %_tablegen.h \ %_tables.h \ aac_tablegen_decl.h \ fft-internal.h \ + old_codec_ids.h \ tableprint.h \ $(ARCH)/vp56_arith.h \ diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index b807ae4bf3..8c28b6538a 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -76,9 +76,6 @@ * @{ */ -#if FF_API_CODEC_ID -#include "old_codec_ids.h" -#endif /** * Identify the syntax and semantics of the bitstream. @@ -428,8 +425,16 @@ enum AVCodecID { AV_CODEC_ID_MPEG4SYSTEMS = 0x20001, /**< _FAKE_ codec to indicate a MPEG-4 Systems * stream (only used by libavformat) */ AV_CODEC_ID_FFMETADATA = 0x21000, ///< Dummy codec for streams containing only metadata information. + +#if FF_API_CODEC_ID +#include "old_codec_ids.h" +#endif }; +#if FF_API_CODEC_ID +#define CodecID AVCodecID +#endif + #if FF_API_OLD_DECODE_AUDIO /* in bytes */ #define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio diff --git a/libavcodec/old_codec_ids.h b/libavcodec/old_codec_ids.h index 95b6b737b0..2b72e38d20 100644 --- a/libavcodec/old_codec_ids.h +++ b/libavcodec/old_codec_ids.h @@ -19,8 +19,6 @@ #ifndef AVCODEC_OLD_CODEC_IDS_H #define AVCODEC_OLD_CODEC_IDS_H -#include "libavutil/attributes.h" - /* * This header exists to prevent new codec IDs from being accidentally added to * the deprecated list. @@ -29,8 +27,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, @@ -365,6 +362,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 */ |