diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-11 14:50:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-11 15:01:45 +0200 |
| commit | f5f3684fb8d3881a6f90913417b2b5272df76e49 (patch) | |
| tree | 2cd82a73afe553baeed57683b861e6775ccebb6b /libavcodec/old_codec_ids.h | |
| parent | 48d20b918c80a68e61f8bdedbf335ed4a00d6a32 (diff) | |
| parent | 885da7b08289321b88919e86d1574c8683a95a22 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavf: simplify is_intra_only() by using codec descriptors.
lavc: add an intra-only codec property.
lavc: add codec descriptors.
lavc: fix mixing CODEC_ID/AV_CODEC_ID in C++ code.
dict: move struct AVDictionary definition to dict.c
dict: add av_dict_count()
Conflicts:
doc/APIchanges
libavcodec/old_codec_ids.h
libavformat/utils.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/old_codec_ids.h')
| -rw-r--r-- | libavcodec/old_codec_ids.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libavcodec/old_codec_ids.h b/libavcodec/old_codec_ids.h index 25b3610981..c0ac95101f 100644 --- 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 */ |