|
|
@@ -164,7 +164,7 @@ int update_dimensions(VP8Context *s, int width, int height, int is_vp7) |
|
|
s->mb_height = (s->avctx->coded_height + 15) / 16; |
|
|
s->mb_height = (s->avctx->coded_height + 15) / 16; |
|
|
|
|
|
|
|
|
s->mb_layout = is_vp7 || avctx->active_thread_type == FF_THREAD_SLICE && |
|
|
s->mb_layout = is_vp7 || avctx->active_thread_type == FF_THREAD_SLICE && |
|
|
FFMIN(s->num_coeff_partitions, avctx->thread_count) > 1; |
|
|
|
|
|
|
|
|
avctx->thread_count > 1; |
|
|
if (!s->mb_layout) { // Frame threading and one thread |
|
|
if (!s->mb_layout) { // Frame threading and one thread |
|
|
s->macroblocks_base = av_mallocz((s->mb_width + s->mb_height * 2 + 1) * |
|
|
s->macroblocks_base = av_mallocz((s->mb_width + s->mb_height * 2 + 1) * |
|
|
sizeof(*s->macroblocks)); |
|
|
sizeof(*s->macroblocks)); |
|
|
|