projects / libvpx / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: fa9db8d) | patch
Fix a merge conflict
authorYaowu Xu <yaowu@google.com>
Fri, 7 Jun 2013 05:10:07 +0000 (22:10 -0700)
committerYaowu Xu <yaowu@google.com>
Fri, 7 Jun 2013 05:10:07 +0000 (22:10 -0700)
commit472669befb732396e10e15270059205683c73b8f
tree7baa6e49d4c7a49b8f6fa43d989163e6aabe7d65tree | snapshot
parentfa9db8da150164dd8069d01c76fa663a82b114aecommit | diff
Fix a merge conflict

ref_frame in MB_Mode_Info was changed in the ref frame coding patch
to be an array to handle first and second reference frame, this patch
fix the loop filter code that use the pointer directly as reference
frame.

Change-Id: I71afa5a49deb50c1bc38029fd07470b984c6dfe9
vp9/common/vp9_loopfilter.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.