Mercurial > libavcodec.hg
diff avcodec.h @ 1168:5af9aeadbdc3 libavcodec
H264 decoder & demuxer
author | michaelni |
---|---|
date | Fri, 04 Apr 2003 14:42:28 +0000 |
parents | 1d2ced5e79f3 |
children | 9d257357ce07 |
line wrap: on
line diff
--- a/avcodec.h Fri Apr 04 13:45:45 2003 +0000 +++ b/avcodec.h Fri Apr 04 14:42:28 2003 +0000 @@ -49,6 +49,7 @@ CODEC_ID_MACE6, CODEC_ID_HUFFYUV, CODEC_ID_CYUV, + CODEC_ID_H264, /* various pcm "codecs" */ CODEC_ID_PCM_S16LE, @@ -210,7 +211,7 @@ int key_frame;\ \ /**\ - * picture type of the frame, see ?_TYPE below\ + * picture type of the frame, see ?_TYPE below.\ * - encoding: set by lavc for coded_picture (and set by user for input)\ * - decoding: set by lavc\ */\ @@ -320,7 +321,12 @@ #define FF_P_TYPE 2 // Predicted #define FF_B_TYPE 3 // Bi-dir predicted #define FF_S_TYPE 4 // S(GMC)-VOP MPEG4 +#define FF_SI_TYPE 5 +#define FF_SP_TYPE 6 +/** + * Audio Video Frame. + */ typedef struct AVFrame { FF_COMMON_FRAME } AVFrame; @@ -906,6 +912,7 @@ #define FF_DEBUG_STARTCODE 0x00000100 #define FF_DEBUG_PTS 0x00000200 #define FF_DEBUG_ER 0x00000400 +#define FF_DEBUG_MMCO 0x00000800 /** * error. @@ -1149,6 +1156,7 @@ extern AVCodec wmv1_encoder; extern AVCodec wmv2_encoder; extern AVCodec huffyuv_encoder; +extern AVCodec h264_encoder; extern AVCodec h263_decoder; extern AVCodec mpeg4_decoder; @@ -1174,6 +1182,7 @@ extern AVCodec huffyuv_decoder; extern AVCodec oggvorbis_decoder; extern AVCodec cyuv_decoder; +extern AVCodec h264_decoder; /* pcm codecs */ #define PCM_CODEC(id, name) \