Mercurial > libavcodec.hg
comparison h263dec.c @ 1687:cdc3d4106fb6 libavcodec
cleanup
author | michael |
---|---|
date | Sat, 13 Dec 2003 20:41:33 +0000 |
parents | 4c9fd29f1606 |
children | 3ba5c493db6f |
comparison
equal
deleted
inserted
replaced
1686:68abbec33289 | 1687:cdc3d4106fb6 |
---|---|
83 s->h263_msmpeg4 = 1; | 83 s->h263_msmpeg4 = 1; |
84 s->h263_pred = 1; | 84 s->h263_pred = 1; |
85 s->msmpeg4_version=5; | 85 s->msmpeg4_version=5; |
86 break; | 86 break; |
87 case CODEC_ID_H263I: | 87 case CODEC_ID_H263I: |
88 s->h263_intel = 1; | |
89 break; | 88 break; |
90 case CODEC_ID_FLV1: | 89 case CODEC_ID_FLV1: |
91 s->h263_flv = 1; | 90 s->h263_flv = 1; |
92 break; | 91 break; |
93 default: | 92 default: |
458 } | 457 } |
459 ret = ff_mpeg4_decode_picture_header(s, &s->gb); | 458 ret = ff_mpeg4_decode_picture_header(s, &s->gb); |
460 | 459 |
461 if(s->flags& CODEC_FLAG_LOW_DELAY) | 460 if(s->flags& CODEC_FLAG_LOW_DELAY) |
462 s->low_delay=1; | 461 s->low_delay=1; |
463 } else if (s->h263_intel) { | 462 } else if (s->codec_id == CODEC_ID_H263I) { |
464 ret = intel_h263_decode_picture_header(s); | 463 ret = intel_h263_decode_picture_header(s); |
465 } else if (s->h263_flv) { | 464 } else if (s->h263_flv) { |
466 ret = flv_h263_decode_picture_header(s); | 465 ret = flv_h263_decode_picture_header(s); |
467 } else { | 466 } else { |
468 ret = h263_decode_picture_header(s); | 467 ret = h263_decode_picture_header(s); |