diff options
author | John Koleszar <jkoleszar@google.com> | 2011-05-07 00:05:11 -0400 |
---|---|---|
committer | John Koleszar <jkoleszar@google.com> | 2011-05-07 00:05:11 -0400 |
commit | cadb2d66512c07a54fdf802983ddf2eddb26dbf4 (patch) | |
tree | d5e6db4a957e2d0378d72dcc30297cf50c4925c0 /vp8/encoder/ethreading.c | |
parent | e965d8f6f3d7079bbccac975e057d2b2daa0e20c (diff) | |
parent | 5c756005aaa17759485552edaea3e9ff99760bac (diff) | |
download | libvpx-cadb2d66512c07a54fdf802983ddf2eddb26dbf4.tar libvpx-cadb2d66512c07a54fdf802983ddf2eddb26dbf4.tar.gz libvpx-cadb2d66512c07a54fdf802983ddf2eddb26dbf4.tar.bz2 libvpx-cadb2d66512c07a54fdf802983ddf2eddb26dbf4.zip |
Merge remote branch 'origin/master' into experimental
Change-Id: I22f61430b52348b32078253d5ef38e68e7f91939
Diffstat (limited to 'vp8/encoder/ethreading.c')
-rw-r--r-- | vp8/encoder/ethreading.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/vp8/encoder/ethreading.c b/vp8/encoder/ethreading.c index c92a366e8..c00494dcf 100644 --- a/vp8/encoder/ethreading.c +++ b/vp8/encoder/ethreading.c @@ -514,7 +514,6 @@ void vp8cx_create_encoder_threads(VP8_COMP *cpi) LPFTHREAD_DATA * lpfthd = &cpi->lpf_thread_data; sem_init(&cpi->h_event_start_lpf, 0, 0); - sem_init(&cpi->h_event_end_picklpf, 0, 0); sem_init(&cpi->h_event_end_lpf, 0, 0); lpfthd->ptr1 = (void *)cpi; @@ -548,7 +547,6 @@ void vp8cx_remove_encoder_threads(VP8_COMP *cpi) sem_destroy(&cpi->h_event_end_encoding); sem_destroy(&cpi->h_event_end_lpf); - sem_destroy(&cpi->h_event_end_picklpf); sem_destroy(&cpi->h_event_start_lpf); //free thread related resources |