diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-03-23 00:24:25 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-03-23 00:24:25 -0400 |
| commit | 5f6db3591c64b9d53a5cf76f3afc5c28027d0feb (patch) | |
| tree | d1507d4bff9f2308c8d42606c5345d435e9a6e24 /vp8/common/pragmas.h | |
| parent | 4a1c3cf7d8bb38db15702f6fb772c9b94233c8e9 (diff) | |
| parent | edfc93aebac7674f26ed4c0389d97ae15e8b8c2b (diff) | |
| download | libvpx-5f6db3591c64b9d53a5cf76f3afc5c28027d0feb.tar libvpx-5f6db3591c64b9d53a5cf76f3afc5c28027d0feb.tar.gz libvpx-5f6db3591c64b9d53a5cf76f3afc5c28027d0feb.tar.bz2 libvpx-5f6db3591c64b9d53a5cf76f3afc5c28027d0feb.zip | |
Merge remote branch 'origin/master' into experimental
Conflicts:
vp8/encoder/ratectrl.c
vp8/encoder/rdopt.c
Change-Id: I4cc58acb432662d2c47aceda1680e52982adbc06
Diffstat (limited to 'vp8/common/pragmas.h')
0 files changed, 0 insertions, 0 deletions