diff options
| author | Fabrice Bellard <fabrice@bellard.org> | 2003-09-08 22:03:29 +0000 |
|---|---|---|
| committer | Fabrice Bellard <fabrice@bellard.org> | 2003-09-08 22:03:29 +0000 |
| commit | dcedf5867207ea21c5e492434e6466d1aac79de3 (patch) | |
| tree | b80b169962fa041377389969699f8fe75f054cc1 /libavcodec | |
| parent | 66a15ea2d20841758ebf4f7aab091e203d5f3717 (diff) | |
| download | ffmpeg-streaming-dcedf5867207ea21c5e492434e6466d1aac79de3.zip ffmpeg-streaming-dcedf5867207ea21c5e492434e6466d1aac79de3.tar.gz | |
changed my mind about CODEC_ID_MPEGVIDEO - CODEC_ID_MP3LAME is absolete
Originally committed as revision 2231 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 78f60ab..9bdbeee 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -15,20 +15,20 @@ extern "C" { #define LIBAVCODEC_VERSION_INT 0x000408 #define LIBAVCODEC_VERSION "0.4.8" -#define LIBAVCODEC_BUILD 4677 -#define LIBAVCODEC_BUILD_STR "4677" +#define LIBAVCODEC_BUILD 4678 +#define LIBAVCODEC_BUILD_STR "4678" #define LIBAVCODEC_IDENT "FFmpeg" LIBAVCODEC_VERSION "b" LIBAVCODEC_BUILD_STR enum CodecID { CODEC_ID_NONE, CODEC_ID_MPEG1VIDEO, - CODEC_ID_MPEG2VIDEO, + CODEC_ID_MPEG2VIDEO, /* prefered ID for MPEG Video 1 or 2 decoding */ CODEC_ID_MPEG2VIDEO_XVMC, CODEC_ID_H263, CODEC_ID_RV10, CODEC_ID_MP2, - CODEC_ID_MP3LAME, + CODEC_ID_MP3, /* prefered ID for MPEG Audio layer 1, 2 or3 decoding */ CODEC_ID_VORBIS, CODEC_ID_AC3, CODEC_ID_MJPEG, @@ -100,7 +100,9 @@ enum CodecID { CODEC_ID_INTERPLAY_DPCM, CODEC_ID_XAN_DPCM, }; -#define CODEC_ID_MPEGVIDEO CODEC_ID_MPEG1VIDEO + +/* CODEC_ID_MP3LAME is absolete */ +#define CODEC_ID_MP3LAME CODEC_ID_MP3 enum CodecType { CODEC_TYPE_UNKNOWN = -1, |
