]> granicus.if.org Git - libvpx/commitdiff
projects / libvpx / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 35abb70 4dd3b07)
Merge branch 'master' into experimental
authorJohn Koleszar <jkoleszar@google.com>
Wed, 7 Aug 2013 21:43:17 +0000 (14:43 -0700)
committerJohn Koleszar <jkoleszar@google.com>
Wed, 7 Aug 2013 21:44:06 +0000 (14:44 -0700)
Conflicts:
configure
vp9/common/vp9_entropymode.c
vp9/common/vp9_onyxc_int.h
vp9/common/vp9_reconinter.c
vp9/common/vp9_reconintra.c
vp9/common/x86/vp9_idct_intrin_sse2.c
vp9/decoder/vp9_decodemv.c
vp9/decoder/vp9_decodframe.c
vp9/encoder/vp9_bitstream.c
vp9/encoder/vp9_encodeframe.c
vp9/encoder/vp9_onyx_if.c
vp9/encoder/vp9_onyx_int.h
vp9/encoder/vp9_rdopt.c

Change-Id: I2191e8cf074677d6def890720a6b095457efce18


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.