From e4828c7d43a686a7a91c91ab3e5f47fcc6c2bdc6 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 26 Nov 2002 08:56:10 +0000 Subject: [PATCH] fixing h263+ slices if the padding at the end of the frame is >7 && <16 && there are no zero bytes afterwards Originally committed as revision 1281 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/h263.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavcodec/h263.c b/libavcodec/h263.c index 08ad2c2..0083ca2 100644 --- a/libavcodec/h263.c +++ b/libavcodec/h263.c @@ -3292,14 +3292,14 @@ end: return SLICE_END; } }else{ - if(get_bits_count(&s->gb) + 7 >= s->gb.size*8){ - int v= show_bits(&s->gb, 8) >> (((get_bits_count(&s->gb)-1)&7)+1); - if(v==0) - return SLICE_END; - }else{ - if(show_bits(&s->gb, 16)==0) - return SLICE_END; + int v= show_bits(&s->gb, 16); + + if(get_bits_count(&s->gb) + 16 > s->gb.size*8){ + v>>= get_bits_count(&s->gb) + 16 - s->gb.size*8; } + + if(v==0) + return SLICE_END; } return SLICE_OK; -- 2.7.4