]> granicus.if.org Git - libvpx/commit
projects / libvpx / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 80fadb2 e588525)
Merge branch 'master' into experimental
authorJohann <johann.koenig@duck.com>
Fri, 26 Apr 2013 18:40:43 +0000 (11:40 -0700)
committerJohann <johann.koenig@duck.com>
Fri, 26 Apr 2013 19:57:10 +0000 (12:57 -0700)
commit32a5c52856743c5cce39f73bfc3e6aa77527a8c5
tree82553718f224f4bb4e455745b7af8375a4a2e06ftree | snapshot
parent80fadb261e62a05ba0a22ce8abeb6e1c945c082fcommit | diff
parente58852582d9b785e09dd202c302881a5faf941d2commit | diff
Merge branch 'master' into experimental

Conflicts:
vp9/common/vp9_findnearmv.c
vp9/common/vp9_rtcd_defs.sh
vp9/decoder/vp9_decodframe.c
vp9/decoder/x86/vp9_dequantize_sse2.c
vp9/encoder/vp9_rdopt.c
vp9/vp9_common.mk

Resolve file name changes in favor of master. Resolve rdopt changes in
favor of experimental, preserving the newer experiments.

Change-Id: If51ed8f457470281c7b20a5c1a2f4ce2cf76c20f
build/make/configure.sh diff1 | diff2 | blob | history
test/acm_random.h diff1 | diff2 | blob | history
vp8/encoder/onyx_if.c diff1 | diff2 | blob | history
vp9/decoder/vp9_decodframe.c diff1 | diff2 | blob | history
vp9/decoder/x86/vp9_dequantize_sse2.c diff1 | diff2 | blob | history
vp9/encoder/vp9_sad_c.c diff1 | diff2 | blob | history
vp9/vp9_common.mk diff1 | diff2 | blob | history
vp9/vp9_dx_iface.c diff1 | diff2 | blob | history
vp9/vp9cx.mk diff1 | diff2 | blob | history
vp9/vp9dx.mk diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.