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

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;