shithub: libvpx

Info  •  Files  •  Log  •  Branches

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

--- a/vp8/encoder/ethreading.c

+++ b/vp8/encoder/ethreading.c

@@ -59,8 +59,6 @@

     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 @@

         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;