projects / platform / upstream / libvpx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 11b9b14 00a1e2f)
Merge remote branch 'origin/master' into experimental
authorJohn Koleszar <jkoleszar@google.com>
Thu, 19 May 2011 04:05:12 +0000 (00:05 -0400)
committerJohn Koleszar <jkoleszar@google.com>
Thu, 19 May 2011 04:05:12 +0000 (00:05 -0400)
Change-Id: I2f9fd68d7fd52e0aebc57e561c77ebe99e9c33e4

1  2 
vp8/encoder/encodeframe.c patch | diff1 | diff2 | blob | history
vp8/encoder/rdopt.c patch | diff1 | diff2 | blob | history

diff --cc vp8/encoder/encodeframe.c
Simple merge
diff --cc vp8/encoder/rdopt.c
Simple merge
Domain: Multimedia / Codec;