diff options
author | Johann <johannkoenig@google.com> | 2011-06-17 14:56:27 -0400 |
---|---|---|
committer | Johann <johannkoenig@google.com> | 2011-06-17 14:56:27 -0400 |
commit | e18d7bc23095b89132007c64e38ce262dcb0a943 (patch) | |
tree | 44e1121039142e6637b81b1f389292988dadb546 /examples/simple_encoder.txt | |
parent | 6c8205d37eb47c0757f752505ada46bc4079c003 (diff) | |
parent | a60fc419f50eefbef568ceecb93233471e894fa5 (diff) | |
download | libvpx-e18d7bc23095b89132007c64e38ce262dcb0a943.tar libvpx-e18d7bc23095b89132007c64e38ce262dcb0a943.tar.gz libvpx-e18d7bc23095b89132007c64e38ce262dcb0a943.tar.bz2 libvpx-e18d7bc23095b89132007c64e38ce262dcb0a943.zip |
Merge remote branch 'origin/master' into experimental
Conflicts:
vp8/encoder/encodeframe.c
vp8/encoder/rdopt.c
Change-Id: I8bab720889ac652361abdedfe2cc91a89742cb30
Diffstat (limited to 'examples/simple_encoder.txt')
0 files changed, 0 insertions, 0 deletions