Commit dea68f35 authored by michaelni's avatar michaelni

fixing msmpeg4v3 with mb_height % slice_height != 0


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@1137 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 9b9b60d7
...@@ -60,7 +60,6 @@ static int h263_decode_init(AVCodecContext *avctx) ...@@ -60,7 +60,6 @@ static int h263_decode_init(AVCodecContext *avctx)
switch(avctx->codec->id) { switch(avctx->codec->id) {
case CODEC_ID_H263: case CODEC_ID_H263:
s->gob_number = 0; s->gob_number = 0;
s->first_slice_line = 0;
break; break;
case CODEC_ID_MPEG4: case CODEC_ID_MPEG4:
s->time_increment_bits = 4; /* default value for broken headers */ s->time_increment_bits = 4; /* default value for broken headers */
...@@ -479,7 +478,7 @@ retry: ...@@ -479,7 +478,7 @@ retry:
decode_slice(s); decode_slice(s);
s->error_status_table[0]|= VP_START; 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->msmpeg4_version){
if(s->mb_x!=0 || (s->mb_y%s->slice_height)!=0) if(s->mb_x!=0 || (s->mb_y%s->slice_height)!=0)
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment