Mercurial > libavcodec.hg
diff h263dec.c @ 10803:4605bd2fdb7f libavcodec
Split the mpeg4 encoder and decoder off h263.c
author | michael |
---|---|
date | Thu, 07 Jan 2010 23:53:49 +0000 |
parents | 13c67390a846 |
children | c03a8c6c755b |
line wrap: on
line diff
--- a/h263dec.c Thu Jan 07 22:48:58 2010 +0000 +++ b/h263dec.c Thu Jan 07 23:53:49 2010 +0000 @@ -34,6 +34,7 @@ #include "msmpeg4.h" #include "vdpau_internal.h" #include "flv.h" +#include "mpeg4video.h" //#define DEBUG //#define PRINT_FRAME_TIME @@ -64,11 +65,6 @@ avctx->chroma_sample_location = AVCHROMA_LOC_CENTER; break; case CODEC_ID_MPEG4: - s->decode_mb= ff_mpeg4_decode_mb; - s->time_increment_bits = 4; /* default value for broken headers */ - s->h263_pred = 1; - s->low_delay = 0; //default, might be overriden in the vol header during header parsing - avctx->chroma_sample_location = AVCHROMA_LOC_LEFT; break; case CODEC_ID_MSMPEG4V1: s->h263_msmpeg4 = 1; @@ -731,21 +727,6 @@ return get_consumed_bytes(s, buf_size); } -AVCodec mpeg4_decoder = { - "mpeg4", - CODEC_TYPE_VIDEO, - CODEC_ID_MPEG4, - sizeof(MpegEncContext), - ff_h263_decode_init, - NULL, - ff_h263_decode_end, - ff_h263_decode_frame, - CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY, - .flush= ff_mpeg_flush, - .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2"), - .pix_fmts= ff_hwaccel_pixfmt_list_420, -}; - AVCodec h263_decoder = { "h263", CODEC_TYPE_VIDEO, @@ -816,19 +797,3 @@ .long_name= NULL_IF_CONFIG_SMALL("Windows Media Video 7"), .pix_fmts= ff_pixfmt_list_420, }; - -#if CONFIG_MPEG4_VDPAU_DECODER -AVCodec mpeg4_vdpau_decoder = { - "mpeg4_vdpau", - CODEC_TYPE_VIDEO, - CODEC_ID_MPEG4, - sizeof(MpegEncContext), - ff_h263_decode_init, - NULL, - ff_h263_decode_end, - ff_h263_decode_frame, - CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY | CODEC_CAP_HWACCEL_VDPAU, - .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2 (VDPAU)"), - .pix_fmts= (const enum PixelFormat[]){PIX_FMT_VDPAU_MPEG4, PIX_FMT_NONE}, -}; -#endif