diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2008-12-21 21:30:36 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-12-21 21:30:36 +0000 |
| commit | c62da7972bd159ace1294b6e829d4cfbe2fa9ce7 (patch) | |
| tree | 6cf3ad0acc2f3cebafafd4f5b50e1fd580770794 | |
| parent | 2f3d7ea974749afb65f04b2847d94dd50198359f (diff) | |
| download | ffmpeg-c62da7972bd159ace1294b6e829d4cfbe2fa9ce7.tar.gz | |
Move CODEC_FLAG_LOW_DELAY into ff_mpeg4_decode_picture_header().
Originally committed as revision 16255 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/h263.c | 8 | ||||
| -rw-r--r-- | libavcodec/h263dec.c | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/libavcodec/h263.c b/libavcodec/h263.c index c7dc98ebd9..bbb40a4941 100644 --- a/libavcodec/h263.c +++ b/libavcodec/h263.c @@ -6065,7 +6065,7 @@ int ff_mpeg4_decode_picture_header(MpegEncContext * s, GetBitContext *gb) 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 @@ int ff_mpeg4_decode_picture_header(MpegEncContext * s, GetBitContext *gb) 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 --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 141d15378c..ae318b5576 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -402,9 +402,6 @@ retry: 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) { |