diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2003-08-25 22:47:32 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2003-08-25 22:47:32 +0000 |
| commit | 029911d1c362939b4664e471bb9b13060a31ebde (patch) | |
| tree | ff12ee3b493596d11aa9d4592da14e6986593e2c /libavcodec/avcodec.h | |
| parent | 9b6a5b87a699f469c85ab0bc058988956f4bc012 (diff) | |
| download | ffmpeg-029911d1c362939b4664e471bb9b13060a31ebde.tar.gz | |
mpeg2 encoding
Originally committed as revision 2164 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 61fc553a94..224fbeeed9 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -15,14 +15,15 @@ extern "C" { #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 @@ static const int Motion_Est_QTab[] = { ME_ZERO, ME_PHODS, ME_LOG, #define CODEC_CAP_PARSE_ONLY 0x0004 #define CODEC_CAP_TRUNCATED 0x0008 + #define FF_COMMON_FRAME \ /**\ * pointer to the picture planes.\ @@ -462,7 +464,7 @@ typedef struct AVCodecContext { * 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 @@ typedef struct AVCodecContext { 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 mp2_encoder; 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 @@ typedef enum { 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); |