Mercurial > libavcodec.hg
comparison h263dec.c @ 10792:13c67390a846 libavcodec
2 more if(CONFIG_*_DECODER)
| author | michael |
|---|---|
| date | Thu, 07 Jan 2010 06:32:34 +0000 |
| parents | 48adb5a1b47b |
| children | 4605bd2fdb7f |
comparison
equal
deleted
inserted
replaced
| 10791:48adb5a1b47b | 10792:13c67390a846 |
|---|---|
| 403 /* let's go :-) */ | 403 /* let's go :-) */ |
| 404 if (CONFIG_WMV2_DECODER && s->msmpeg4_version==5) { | 404 if (CONFIG_WMV2_DECODER && s->msmpeg4_version==5) { |
| 405 ret= ff_wmv2_decode_picture_header(s); | 405 ret= ff_wmv2_decode_picture_header(s); |
| 406 } else if (CONFIG_MSMPEG4_DECODER && s->msmpeg4_version) { | 406 } else if (CONFIG_MSMPEG4_DECODER && s->msmpeg4_version) { |
| 407 ret = msmpeg4_decode_picture_header(s); | 407 ret = msmpeg4_decode_picture_header(s); |
| 408 } else if (s->h263_pred) { | 408 } else if (CONFIG_MPEG4_DECODER && s->h263_pred) { |
| 409 if(s->avctx->extradata_size && s->picture_number==0){ | 409 if(s->avctx->extradata_size && s->picture_number==0){ |
| 410 GetBitContext gb; | 410 GetBitContext gb; |
| 411 | 411 |
| 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 (CONFIG_H263I_DECODER && s->codec_id == CODEC_ID_H263I) { |
| 417 ret = ff_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); |