# HG changeset patch # User michael # Date 1229895036 0 # Node ID ad4f1028763363320f8b34da3d0b1e8a0319483c # Parent 7f93fb3600551573c6b8f266917be29198c756b8 Move CODEC_FLAG_LOW_DELAY into ff_mpeg4_decode_picture_header(). diff -r 7f93fb360055 -r ad4f10287633 h263.c --- a/h263.c Sun Dec 21 17:49:40 2008 +0000 +++ b/h263.c Sun Dec 21 21:30:36 2008 +0000 @@ -6065,7 +6065,7 @@ if(s->codec_tag == ff_get_fourcc("WV1F") && show_bits(gb, 24) == 0x575630){ skip_bits(gb, 24); if(get_bits(gb, 8) == 0xF0) - return decode_vop_header(s, gb); + goto end; } startcode = 0xff; @@ -6128,12 +6128,16 @@ mpeg4_decode_gop_header(s, gb); } else if(startcode == VOP_STARTCODE){ - return decode_vop_header(s, gb); + break; } align_get_bits(gb); startcode = 0xff; } +end: + if(s->flags& CODEC_FLAG_LOW_DELAY) + s->low_delay=1; + return decode_vop_header(s, gb); } /* don't understand why they choose a different header ! */ diff -r 7f93fb360055 -r ad4f10287633 h263dec.c --- a/h263dec.c Sun Dec 21 17:49:40 2008 +0000 +++ b/h263dec.c Sun Dec 21 21:30:36 2008 +0000 @@ -402,9 +402,6 @@ ret = ff_mpeg4_decode_picture_header(s, &gb); } ret = ff_mpeg4_decode_picture_header(s, &s->gb); - - if(s->flags& CODEC_FLAG_LOW_DELAY) - s->low_delay=1; } else if (s->codec_id == CODEC_ID_H263I) { ret = intel_h263_decode_picture_header(s); } else if (s->h263_flv) {