projects / platform / upstream / libvpx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b9a1834 00fe744)
Merge branch 'experimental' of ssh://on2-git.corp.google.com:29418/libvpx into test
authorSuman Sunkara <sunkaras@google.com>
Tue, 16 Nov 2010 20:09:26 +0000 (15:09 -0500)
committerSuman Sunkara <sunkaras@google.com>
Tue, 16 Nov 2010 21:30:59 +0000 (16:30 -0500)
commit4b3f72001de952aaf3874d3ce2dca3cb3fbe3928
tree754d87a4fa5cae908388f0a26b2affad7cd8a523tree | snapshot
parentb9a18344cf8e5283928525c5ac0897ede79f9e57commit | diff
parent00fe7441e9c5cbd898a8382d49cf9396d8482464commit | diff
Merge branch 'experimental' of ssh://on2-git.corp.google.com:29418/libvpx into test

Conflicts:
vp8/common/blockd.h
vp8/decoder/decodemv.c
vp8/decoder/decodframe.c
vp8/decoder/demode.c
vp8/decoder/onyxd_if.c
vp8/decoder/onyxd_int.h
vp8/encoder/encodeframe.c

Change-Id: Ic379f4dffaded9796dc19d56be304d3f8527c61f
12 files changed:
configure diff1 | diff2 | blob | history
vp8/common/blockd.h diff1 | diff2 | blob | history
vp8/decoder/decodemv.c diff1 | diff2 | blob | history
vp8/decoder/decodframe.c diff1 | diff2 | blob | history
vp8/decoder/onyxd_if.c diff1 | diff2 | blob | history
vp8/decoder/onyxd_int.h diff1 | diff2 | blob | history
vp8/encoder/bitstream.c diff1 | diff2 | blob | history
vp8/encoder/encodeframe.c diff1 | diff2 | blob | history
vp8/encoder/ethreading.c diff1 | diff2 | blob | history
vp8/encoder/onyx_if.c diff1 | diff2 | blob | history
vp8/encoder/onyx_int.h diff1 | diff2 | blob | history
vpxenc.c | diff2 | blob | history
Domain: Multimedia / Codec;