Mercurial > libavcodec.hg
comparison h263dec.c @ 822:21d400c67fc5 libavcodec
fixing msmpeg4v3 with mb_height % slice_height != 0
author | michaelni |
---|---|
date | Fri, 01 Nov 2002 18:55:03 +0000 |
parents | d4cc92144266 |
children | 371ef113d984 |
comparison
equal
deleted
inserted
replaced
821:f5f2e162331c | 822:21d400c67fc5 |
---|---|
58 | 58 |
59 /* select sub codec */ | 59 /* select sub codec */ |
60 switch(avctx->codec->id) { | 60 switch(avctx->codec->id) { |
61 case CODEC_ID_H263: | 61 case CODEC_ID_H263: |
62 s->gob_number = 0; | 62 s->gob_number = 0; |
63 s->first_slice_line = 0; | |
64 break; | 63 break; |
65 case CODEC_ID_MPEG4: | 64 case CODEC_ID_MPEG4: |
66 s->time_increment_bits = 4; /* default value for broken headers */ | 65 s->time_increment_bits = 4; /* default value for broken headers */ |
67 s->h263_pred = 1; | 66 s->h263_pred = 1; |
68 s->has_b_frames = 1; //default, might be overriden in the vol header during header parsing | 67 s->has_b_frames = 1; //default, might be overriden in the vol header during header parsing |
477 s->mb_x=0; | 476 s->mb_x=0; |
478 s->mb_y=0; | 477 s->mb_y=0; |
479 | 478 |
480 decode_slice(s); | 479 decode_slice(s); |
481 s->error_status_table[0]|= VP_START; | 480 s->error_status_table[0]|= VP_START; |
482 while(s->mb_y<s->mb_height && s->gb.size*8 - get_bits_count(&s->gb)>32){ | 481 while(s->mb_y<s->mb_height && s->gb.size*8 - get_bits_count(&s->gb)>16){ |
483 if(s->msmpeg4_version){ | 482 if(s->msmpeg4_version){ |
484 if(s->mb_x!=0 || (s->mb_y%s->slice_height)!=0) | 483 if(s->mb_x!=0 || (s->mb_y%s->slice_height)!=0) |
485 break; | 484 break; |
486 }else{ | 485 }else{ |
487 if(ff_h263_resync(s)<0) | 486 if(ff_h263_resync(s)<0) |