mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-02 06:23:23 +02:00
mpeg4videodec: Fix new slice end detection for missing slices.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
3fec40b601
commit
fe0ac337bd
@ -1489,6 +1489,16 @@ end:
|
|||||||
return -1;
|
return -1;
|
||||||
} else if (s->mb_x + s->mb_y*s->mb_width + 1 >= next)
|
} else if (s->mb_x + s->mb_y*s->mb_width + 1 >= next)
|
||||||
return SLICE_END;
|
return SLICE_END;
|
||||||
|
|
||||||
|
if(s->pict_type==AV_PICTURE_TYPE_B){
|
||||||
|
const int delta= s->mb_x + 1 == s->mb_width ? 2 : 1;
|
||||||
|
ff_thread_await_progress((AVFrame*)s->next_picture_ptr,
|
||||||
|
(s->mb_x + delta >= s->mb_width) ? FFMIN(s->mb_y+1, s->mb_height-1) : s->mb_y, 0);
|
||||||
|
if (s->next_picture.f.mbskip_table[xy + delta])
|
||||||
|
return SLICE_OK;
|
||||||
|
}
|
||||||
|
|
||||||
|
return SLICE_END;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user