Mercurial > libavcodec.hg
comparison h263.c @ 8417:ad4f10287633 libavcodec
Move CODEC_FLAG_LOW_DELAY into ff_mpeg4_decode_picture_header().
| author | michael |
|---|---|
| date | Sun, 21 Dec 2008 21:30:36 +0000 |
| parents | 20e0f0809b27 |
| children | f75be04312dc |
comparison
equal
deleted
inserted
replaced
| 8416:7f93fb360055 | 8417:ad4f10287633 |
|---|---|
| 6063 align_get_bits(gb); | 6063 align_get_bits(gb); |
| 6064 | 6064 |
| 6065 if(s->codec_tag == ff_get_fourcc("WV1F") && show_bits(gb, 24) == 0x575630){ | 6065 if(s->codec_tag == ff_get_fourcc("WV1F") && show_bits(gb, 24) == 0x575630){ |
| 6066 skip_bits(gb, 24); | 6066 skip_bits(gb, 24); |
| 6067 if(get_bits(gb, 8) == 0xF0) | 6067 if(get_bits(gb, 8) == 0xF0) |
| 6068 return decode_vop_header(s, gb); | 6068 goto end; |
| 6069 } | 6069 } |
| 6070 | 6070 |
| 6071 startcode = 0xff; | 6071 startcode = 0xff; |
| 6072 for(;;) { | 6072 for(;;) { |
| 6073 if(get_bits_count(gb) >= gb->size_in_bits){ | 6073 if(get_bits_count(gb) >= gb->size_in_bits){ |
| 6126 } | 6126 } |
| 6127 else if(startcode == GOP_STARTCODE){ | 6127 else if(startcode == GOP_STARTCODE){ |
| 6128 mpeg4_decode_gop_header(s, gb); | 6128 mpeg4_decode_gop_header(s, gb); |
| 6129 } | 6129 } |
| 6130 else if(startcode == VOP_STARTCODE){ | 6130 else if(startcode == VOP_STARTCODE){ |
| 6131 return decode_vop_header(s, gb); | 6131 break; |
| 6132 } | 6132 } |
| 6133 | 6133 |
| 6134 align_get_bits(gb); | 6134 align_get_bits(gb); |
| 6135 startcode = 0xff; | 6135 startcode = 0xff; |
| 6136 } | 6136 } |
| 6137 end: | |
| 6138 if(s->flags& CODEC_FLAG_LOW_DELAY) | |
| 6139 s->low_delay=1; | |
| 6140 return decode_vop_header(s, gb); | |
| 6137 } | 6141 } |
| 6138 | 6142 |
| 6139 /* don't understand why they choose a different header ! */ | 6143 /* don't understand why they choose a different header ! */ |
| 6140 int intel_h263_decode_picture_header(MpegEncContext *s) | 6144 int intel_h263_decode_picture_header(MpegEncContext *s) |
| 6141 { | 6145 { |