comparison h263dec.c @ 10791:48adb5a1b47b libavcodec

Split out intel H263 decoder.
author michael
date Thu, 07 Jan 2010 06:25:41 +0000
parents 0c8f9288b5e4
children 13c67390a846
comparison
equal deleted inserted replaced
10790:145b62a1de1c 10791:48adb5a1b47b
412 init_get_bits(&gb, s->avctx->extradata, s->avctx->extradata_size*8); 412 init_get_bits(&gb, s->avctx->extradata, s->avctx->extradata_size*8);
413 ret = ff_mpeg4_decode_picture_header(s, &gb); 413 ret = ff_mpeg4_decode_picture_header(s, &gb);
414 } 414 }
415 ret = ff_mpeg4_decode_picture_header(s, &s->gb); 415 ret = ff_mpeg4_decode_picture_header(s, &s->gb);
416 } else if (s->codec_id == CODEC_ID_H263I) { 416 } else if (s->codec_id == CODEC_ID_H263I) {
417 ret = intel_h263_decode_picture_header(s); 417 ret = ff_intel_h263_decode_picture_header(s);
418 } else if (CONFIG_FLV_DECODER && s->h263_flv) { 418 } else if (CONFIG_FLV_DECODER && s->h263_flv) {
419 ret = ff_flv_decode_picture_header(s); 419 ret = ff_flv_decode_picture_header(s);
420 } else { 420 } else {
421 ret = h263_decode_picture_header(s); 421 ret = h263_decode_picture_header(s);
422 } 422 }
812 NULL, 812 NULL,
813 ff_h263_decode_end, 813 ff_h263_decode_end,
814 ff_h263_decode_frame, 814 ff_h263_decode_frame,
815 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, 815 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
816 .long_name= NULL_IF_CONFIG_SMALL("Windows Media Video 7"), 816 .long_name= NULL_IF_CONFIG_SMALL("Windows Media Video 7"),
817 .pix_fmts= ff_pixfmt_list_420,
818 };
819
820 AVCodec h263i_decoder = {
821 "h263i",
822 CODEC_TYPE_VIDEO,
823 CODEC_ID_H263I,
824 sizeof(MpegEncContext),
825 ff_h263_decode_init,
826 NULL,
827 ff_h263_decode_end,
828 ff_h263_decode_frame,
829 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
830 .long_name = NULL_IF_CONFIG_SMALL("Intel H.263"),
831 .pix_fmts= ff_pixfmt_list_420, 817 .pix_fmts= ff_pixfmt_list_420,
832 }; 818 };
833 819
834 #if CONFIG_MPEG4_VDPAU_DECODER 820 #if CONFIG_MPEG4_VDPAU_DECODER
835 AVCodec mpeg4_vdpau_decoder = { 821 AVCodec mpeg4_vdpau_decoder = {