aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2002-11-01 18:55:03 +0000
committerMichael Niedermayer <michaelni@gmx.at>2002-11-01 18:55:03 +0000
commit6a70098ac618fa7990c621940ad48da06164257a (patch)
tree42c94035472c607c2c0a633ac3f1c16e52d12e0f
parenta749913f4caf02a16779b41714bb2eca629ae7a2 (diff)
downloadffmpeg-6a70098ac618fa7990c621940ad48da06164257a.tar.gz
fixing msmpeg4v3 with mb_height % slice_height != 0
Originally committed as revision 1137 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/h263dec.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index 491d80454c..3a49b97e6b 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -60,7 +60,6 @@ static int h263_decode_init(AVCodecContext *avctx)
switch(avctx->codec->id) {
case CODEC_ID_H263:
s->gob_number = 0;
- s->first_slice_line = 0;
break;
case CODEC_ID_MPEG4:
s->time_increment_bits = 4; /* default value for broken headers */
@@ -479,7 +478,7 @@ retry:
decode_slice(s);
s->error_status_table[0]|= VP_START;
- while(s->mb_y<s->mb_height && s->gb.size*8 - get_bits_count(&s->gb)>32){
+ while(s->mb_y<s->mb_height && s->gb.size*8 - get_bits_count(&s->gb)>16){
if(s->msmpeg4_version){
if(s->mb_x!=0 || (s->mb_y%s->slice_height)!=0)
break;