summaryrefslogtreecommitdiff
path: root/vp8/encoder/onyx_if.c
diff options
context:
space:
mode:
authorJohn Koleszar <jkoleszar@google.com>2011-04-01 00:05:12 -0400
committerJohn Koleszar <jkoleszar@google.com>2011-04-01 00:05:12 -0400
commit305c9b57b291b0a7ef29e1d2fa4cbeeeeed8cf7f (patch)
tree60b0b52166cac81378ba87ad662742e6fbba3da5 /vp8/encoder/onyx_if.c
parenteb615e53e101b5f5ff398143ded26b494f8186c6 (diff)
parent9d138379a258ba6019a338ec748ebbd2aab1ba15 (diff)
downloadlibvpx-305c9b57b291b0a7ef29e1d2fa4cbeeeeed8cf7f.tar
libvpx-305c9b57b291b0a7ef29e1d2fa4cbeeeeed8cf7f.tar.gz
libvpx-305c9b57b291b0a7ef29e1d2fa4cbeeeeed8cf7f.tar.bz2
libvpx-305c9b57b291b0a7ef29e1d2fa4cbeeeeed8cf7f.zip
Merge remote branch 'internal/upstream' into HEAD
Diffstat (limited to 'vp8/encoder/onyx_if.c')
-rw-r--r--vp8/encoder/onyx_if.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c
index a3e1b27ab..67c6f61d0 100644
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -3329,7 +3329,8 @@ void loopfilter_frame(VP8_COMP *cpi, VP8_COMMON *cm)
}
#if CONFIG_MULTITHREAD
- sem_post(&cpi->h_event_end_lpf); /* signal that we have set filter_level */
+ if (cpi->b_multi_threaded)
+ sem_post(&cpi->h_event_end_lpf); /* signal that we have set filter_level */
#endif
if (cm->filter_level > 0)