diff options
| author | Attila Nagy <attilanagy@google.com> | 2012-08-02 22:29:38 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-08-02 22:29:38 -0700 |
| commit | b78d90703c8e077ccb755c67db2f85dbc452cc5d (patch) | |
| tree | c095844cbe02e94cbe6faaffab9a7ff552e2280a /vp8 | |
| parent | 4b0b43632bdb268222b1647771a1cf748235f61e (diff) | |
| parent | 03b3fcecac41566aadb99281cff3444d903820b8 (diff) | |
| download | libvpx-b78d90703c8e077ccb755c67db2f85dbc452cc5d.tar libvpx-b78d90703c8e077ccb755c67db2f85dbc452cc5d.tar.gz libvpx-b78d90703c8e077ccb755c67db2f85dbc452cc5d.tar.bz2 libvpx-b78d90703c8e077ccb755c67db2f85dbc452cc5d.zip | |
Merge "Fix potential encoder dead-lock after picture resize"
Diffstat (limited to 'vp8')
| -rw-r--r-- | vp8/encoder/ethreading.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/vp8/encoder/ethreading.c b/vp8/encoder/ethreading.c index 919bc70a0..e0bb1b09f 100644 --- a/vp8/encoder/ethreading.c +++ b/vp8/encoder/ethreading.c @@ -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; |