diff options
| author | Scott LaVarnway <slavarnway@google.com> | 2011-10-04 09:57:42 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2011-10-04 09:57:42 -0700 |
| commit | af12c23e8ee6931c364f417d510b48de6e1d8530 (patch) | |
| tree | fc453cdb319ea8a7ace7e0e8389a9654242a3d7f /vp8/common | |
| parent | 8f8b526b54dca6e651f0d3a1b53a2b39002a3c15 (diff) | |
| parent | ab00d209bc9d9f373c841e889bf6adb80fa8d300 (diff) | |
| download | libvpx-af12c23e8ee6931c364f417d510b48de6e1d8530.tar libvpx-af12c23e8ee6931c364f417d510b48de6e1d8530.tar.gz libvpx-af12c23e8ee6931c364f417d510b48de6e1d8530.tar.bz2 libvpx-af12c23e8ee6931c364f417d510b48de6e1d8530.zip | |
Merge "Improved tokenize"
Diffstat (limited to 'vp8/common')
| -rw-r--r-- | vp8/common/blockd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp8/common/blockd.h b/vp8/common/blockd.h index 6cb3fe1bb..5012edd61 100644 --- a/vp8/common/blockd.h +++ b/vp8/common/blockd.h @@ -62,7 +62,7 @@ extern const unsigned char vp8_block2left[25]; extern const unsigned char vp8_block2above[25]; #define VP8_COMBINEENTROPYCONTEXTS( Dest, A, B) \ - Dest = ((A)!=0) + ((B)!=0); + Dest = (A)+(B); typedef enum |