git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3fec40b
)
mpeg4videodec: Fix new slice end detection for missing slices.
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 11 Sep 2011 15:35:42 +0000
(17:35 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 11 Sep 2011 15:36:37 +0000
(17:36 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpeg4videodec.c
patch
|
blob
|
history
diff --git
a/libavcodec/mpeg4videodec.c
b/libavcodec/mpeg4videodec.c
index
759109f
..
9d8e193
100644
(file)
--- 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;
}
}