Commit 7316a145 authored by bellard's avatar bellard

changed my mind about CODEC_ID_MPEGVIDEO - CODEC_ID_MP3LAME is absolete


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@2231 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 179a17fe
......@@ -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,
......
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