From fe0ac337bd6b4783162bc55eb62f82181d498d5e Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 11 Sep 2011 17:35:42 +0200 Subject: [PATCH] mpeg4videodec: Fix new slice end detection for missing slices. Signed-off-by: Michael Niedermayer --- libavcodec/mpeg4videodec.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 759109fed..9d8e19326 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -1489,6 +1489,16 @@ end: return -1; } else if (s->mb_x + s->mb_y*s->mb_width + 1 >= next) 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; } } -- 2.11.0