Merge "Add estimated completion time to vpxenc" into experimental
authorJohn Koleszar <jkoleszar@google.com>
Tue, 19 Feb 2013 18:51:42 +0000 (10:51 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 19 Feb 2013 18:51:42 +0000 (10:51 -0800)
1  2 
vpxenc.c

diff --cc vpxenc.c
Simple merge