projects
/
platform
/
upstream
/
libvpx.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c23096e
1a7ce50
)
Merge remote branch 'internal/upstream-experimental' into HEAD
author
John Koleszar
<jkoleszar@google.com>
Thu, 3 Mar 2011 13:58:57 +0000
(08:58 -0500)
committer
John Koleszar
<jkoleszar@google.com>
Thu, 3 Mar 2011 13:58:57 +0000
(08:58 -0500)
Conflicts:
vp8/common/blockd.h
Change-Id: Ica2bd1c3da614eab5ce23acfb597e777d16b3983
1
2
vp8/common/blockd.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
vp8/common/blockd.h
index
3b4986f
,
fc8e072
..
906e055
---
1
/
vp8/common/blockd.h
---
2
/
vp8/common/blockd.h
+++ b/
vp8/common/blockd.h
@@@
-28,12
-28,7
+28,8
@@@
void vpx_log(const char *format, ...)
#define DCPREDSIMTHRESH 0
#define DCPREDCNTTHRESH 3
- #define Y1CONTEXT 0
- #define UCONTEXT 1
- #define VCONTEXT 2
- #define Y2CONTEXT 3
#define MB_FEATURE_TREE_PROBS 3
+
#define MAX_MB_SEGMENTS 4
#define MAX_REF_LF_DELTAS 4