mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
changed my mind about CODEC_ID_MPEGVIDEO - CODEC_ID_MP3LAME is absolete
Originally committed as revision 2231 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
66a15ea2d2
commit
dcedf58672
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user