Commit b78d9070 authored by Attila Nagy's avatar Attila Nagy Committed by Gerrit Code Review
Browse files

Merge "Fix potential encoder dead-lock after picture resize"

parents 4b0b4363 03b3fcec
......@@ -59,8 +59,6 @@ THREAD_FUNCTION thread_encoding_proc(void *p_data)
MB_ROW_COMP *mbri = (MB_ROW_COMP *)(((ENCODETHREAD_DATA *)p_data)->ptr2);
ENTROPY_CONTEXT_PLANES mb_row_left_context;
const int nsync = cpi->mt_sync_range;
while (1)
{
if (cpi->b_multi_threaded == 0)
......@@ -68,6 +66,7 @@ THREAD_FUNCTION thread_encoding_proc(void *p_data)
if (sem_wait(&cpi->h_event_start_encoding[ithread]) == 0)
{
const int nsync = cpi->mt_sync_range;
VP8_COMMON *cm = &cpi->common;
int mb_row;
MACROBLOCK *x = &mbri->mb;
......
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