diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-06-06 15:50:48 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-06-06 15:50:48 -0400 |
| commit | be15a099806347111cf461371f4fef0e783fd548 (patch) | |
| tree | 2ba2d9ab4b4f767438c64529c93635cf9f650d8c /LICENSE | |
| parent | 90e84704ae940d7380bba36310c94a05bc9f4569 (diff) | |
| parent | 2c308f36fc0f341eb0be7c5f1cdded13e7d68c2e (diff) | |
| download | libvpx-be15a099806347111cf461371f4fef0e783fd548.tar libvpx-be15a099806347111cf461371f4fef0e783fd548.tar.gz libvpx-be15a099806347111cf461371f4fef0e783fd548.tar.bz2 libvpx-be15a099806347111cf461371f4fef0e783fd548.zip | |
Merge remote branch 'internal/upstream-experimental' into HEAD
Conflicts:
vp8/encoder/encodeframe.c
Change-Id: Ibb5a3894ede08ed401ec6e974a8902d7393c9978
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions