diff options
| author | Yaowu Xu <yaowu@google.com> | 2011-07-20 12:14:50 -0700 |
|---|---|---|
| committer | Yaowu Xu <yaowu@google.com> | 2011-07-20 12:45:35 -0700 |
| commit | 1c24eb2b7b3a61893ea19e9e544c24a233f89921 (patch) | |
| tree | e84e5a106603a86588f206d6057020535648b118 /vp8/common/reconinter.h | |
| parent | 08f64718905efe994a207af95b1c276c104e4113 (diff) | |
| download | libvpx-1c24eb2b7b3a61893ea19e9e544c24a233f89921.tar libvpx-1c24eb2b7b3a61893ea19e9e544c24a233f89921.tar.gz libvpx-1c24eb2b7b3a61893ea19e9e544c24a233f89921.tar.bz2 libvpx-1c24eb2b7b3a61893ea19e9e544c24a233f89921.zip | |
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
Diffstat (limited to 'vp8/common/reconinter.h')
0 files changed, 0 insertions, 0 deletions