diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2003-04-16 00:18:35 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2003-04-16 00:18:35 +0000 |
| commit | 1d0821178b1c27e35595f72bd9adda5945c7be8b (patch) | |
| tree | 217e2a8eb9c63b36c22f90486752b09fc9aa00ea /src/libffmpeg/libavcodec/avcodec.h | |
| parent | ed5ec90442b4dda3918372b43072205fb4ea6167 (diff) | |
| download | xine-lib-1d0821178b1c27e35595f72bd9adda5945c7be8b.tar.gz xine-lib-1d0821178b1c27e35595f72bd9adda5945c7be8b.tar.bz2 | |
ffmpeg update, add new files/decoders, use our fastmemcpy
tested ok with usual files (wmv7, mpeg4, divx, svq1...)
CVS patchset: 4618
CVS date: 2003/04/16 00:18:35
Diffstat (limited to 'src/libffmpeg/libavcodec/avcodec.h')
| -rw-r--r-- | src/libffmpeg/libavcodec/avcodec.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/libffmpeg/libavcodec/avcodec.h b/src/libffmpeg/libavcodec/avcodec.h index c8b48c072..d3c2bb13d 100644 --- a/src/libffmpeg/libavcodec/avcodec.h +++ b/src/libffmpeg/libavcodec/avcodec.h @@ -49,6 +49,8 @@ enum CodecID { CODEC_ID_MACE6, CODEC_ID_HUFFYUV, CODEC_ID_CYUV, + CODEC_ID_H264, + CODEC_ID_INDEO3, /* various pcm "codecs" */ CODEC_ID_PCM_S16LE, @@ -210,7 +212,7 @@ static const int Motion_Est_QTab[] = { ME_ZERO, ME_PHODS, ME_LOG, 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\ */\ @@ -222,7 +224,7 @@ static const int Motion_Est_QTab[] = { ME_ZERO, ME_PHODS, ME_LOG, * - encoding: MUST be set by user\ * - decoding: set by lavc\ */\ - long long int pts;\ + int64_t pts;\ \ /**\ * picture number in bitstream order.\ @@ -320,7 +322,12 @@ static const int Motion_Est_QTab[] = { ME_ZERO, ME_PHODS, ME_LOG, #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 +913,7 @@ typedef struct AVCodecContext { #define FF_DEBUG_STARTCODE 0x00000100 #define FF_DEBUG_PTS 0x00000200 #define FF_DEBUG_ER 0x00000400 +#define FF_DEBUG_MMCO 0x00000800 /** * error. @@ -1149,6 +1157,7 @@ extern AVCodec msmpeg4v3_encoder; 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 +1183,8 @@ extern AVCodec mace6_decoder; extern AVCodec huffyuv_decoder; extern AVCodec oggvorbis_decoder; extern AVCodec cyuv_decoder; +extern AVCodec h264_decoder; +extern AVCodec indeo3_decoder; /* pcm codecs */ #define PCM_CODEC(id, name) \ |