]> granicus.if.org Git - libvpx/commit
fixed a number of problems caused by auto merges
authorYaowu Xu <yaowu@google.com>
Wed, 20 Jul 2011 19:14:50 +0000 (12:14 -0700)
committerYaowu Xu <yaowu@google.com>
Wed, 20 Jul 2011 19:45:35 +0000 (12:45 -0700)
commit1c24eb2b7b3a61893ea19e9e544c24a233f89921
treee84e5a106603a86588f206d6057020535648b118
parent08f64718905efe994a207af95b1c276c104e4113
fixed a number of problems caused by auto merges

The auto merge process pull and merge commits from public git or master
branch. These automerges while worked well most time, but has created
a few problems. This commit fixed several issues existed long before
the latest 8x8 transform commit.

Change-Id: I895ca99713231b1aec521d57db5d9839f74aacfa
vp8/decoder/onyxd_if.c
vp8/decoder/onyxd_int.h
vp8/encoder/bitstream.c
vp8/encoder/encodeframe.c