Merge remote branch 'internal/upstream' into HEAD

2011-05-07 00:05:11 -04:00
parent 3a0f8e0783 5c756005aa
commit 017e85cf58
13 changed files with 99 additions and 166 deletions
--- a/vp8/encoder/onyx_int.h
+++ b/vp8/encoder/onyx_int.h
@@ -594,7 +594,6 @@ typedef struct
    sem_t *h_event_start_encoding;
    sem_t h_event_end_encoding;
    sem_t h_event_start_lpf;
-    sem_t h_event_end_picklpf;
    sem_t h_event_end_lpf;
 #endif