diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2002-04-05 04:09:04 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2002-04-05 04:09:04 +0000 |
| commit | 84afee348f7342f60cf803d398be0013a5fcddc5 (patch) | |
| tree | 05d00a0dc176d75d65031bd4a86f2bfdea5a56ed /libavcodec/avcodec.h | |
| parent | fcb609f4324549b29849487716557cb3a321af17 (diff) | |
| download | ffmpeg-84afee348f7342f60cf803d398be0013a5fcddc5.tar.gz | |
msmpeg4v2 decoding (no encoding yet)
Originally committed as revision 376 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 8306ad9ba6..41bd49eff5 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -14,7 +14,9 @@ enum CodecID { CODEC_ID_MJPEG, CODEC_ID_MPEG4, CODEC_ID_RAWVIDEO, - CODEC_ID_MSMPEG4, + CODEC_ID_MSMPEG4V1, + CODEC_ID_MSMPEG4V2, + CODEC_ID_MSMPEG4V3, CODEC_ID_H263P, CODEC_ID_H263I, @@ -28,6 +30,7 @@ enum CodecID { CODEC_ID_PCM_MULAW, CODEC_ID_PCM_ALAW, }; +#define CODEC_ID_MSMPEG4 CODEC_ID_MSMPEG4V3 enum CodecType { CODEC_TYPE_VIDEO, @@ -200,11 +203,15 @@ extern AVCodec h263p_encoder; extern AVCodec rv10_encoder; extern AVCodec mjpeg_encoder; extern AVCodec mpeg4_encoder; -extern AVCodec msmpeg4_encoder; +extern AVCodec msmpeg4v1_encoder; +extern AVCodec msmpeg4v2_encoder; +extern AVCodec msmpeg4v3_encoder; extern AVCodec h263_decoder; extern AVCodec mpeg4_decoder; -extern AVCodec msmpeg4_decoder; +extern AVCodec msmpeg4v1_decoder; +extern AVCodec msmpeg4v2_decoder; +extern AVCodec msmpeg4v3_decoder; extern AVCodec mpeg_decoder; extern AVCodec h263i_decoder; extern AVCodec rv10_decoder; |