Mercurial > libavcodec.hg
diff avcodec.h @ 1421:340c90faa1dc libavcodec
mpeg2 encoding
author | michaelni |
---|---|
date | Mon, 25 Aug 2003 22:47:32 +0000 |
parents | c2e63cb94d06 |
children | efeed6e29f9b |
line wrap: on
line diff
--- a/avcodec.h Mon Aug 25 12:50:15 2003 +0000 +++ b/avcodec.h Mon Aug 25 22:47:32 2003 +0000 @@ -15,14 +15,15 @@ #define LIBAVCODEC_VERSION_INT 0x000406 #define LIBAVCODEC_VERSION "0.4.6" -#define LIBAVCODEC_BUILD 4675 -#define LIBAVCODEC_BUILD_STR "4675" +#define LIBAVCODEC_BUILD 4676 +#define LIBAVCODEC_BUILD_STR "4676" #define LIBAVCODEC_IDENT "FFmpeg" LIBAVCODEC_VERSION "b" LIBAVCODEC_BUILD_STR enum CodecID { CODEC_ID_NONE, CODEC_ID_MPEG1VIDEO, + CODEC_ID_MPEG2VIDEO, CODEC_ID_MPEG2VIDEO_XVMC, CODEC_ID_H263, CODEC_ID_RV10, @@ -219,6 +220,7 @@ #define CODEC_CAP_PARSE_ONLY 0x0004 #define CODEC_CAP_TRUNCATED 0x0008 + #define FF_COMMON_FRAME \ /**\ * pointer to the picture planes.\ @@ -462,7 +464,7 @@ * do something for a generic case as well. * - decoding: set by lavc. */ - enum PixelFormat pix_fmt; + enum PixelFormat pix_fmt; //FIXME move to AVFrme /** * Frame rate emulation. If not zero lower layer (i.e. format handler) @@ -710,7 +712,7 @@ data is returned. Only MPEG codecs support this now. */ /** - * 0-> h263 quant 1-> mpeg quant. + * 0-> default, 1-> mpeg quant. * - encoding: set by user. * - decoding: unused */ @@ -1281,6 +1283,7 @@ extern AVCodec mp3lame_encoder; extern AVCodec oggvorbis_encoder; extern AVCodec mpeg1video_encoder; +extern AVCodec mpeg2video_encoder; extern AVCodec h263_encoder; extern AVCodec h263p_encoder; extern AVCodec flv_encoder; @@ -1587,7 +1590,7 @@ int avcodec(void* handle, avc_cmd_t cmd, void* pin, void* pout); /* memory */ -void *av_malloc(unsigned int size); +void *av_malloc(unsigned int size); //FIXME unsigned could be bad, dunno, need thinking void *av_mallocz(unsigned int size); void *av_realloc(void *ptr, unsigned int size); void av_free(void *ptr);