diff options
| author | John Koleszar <jkoleszar@google.com> | 2013-03-27 12:29:32 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-03-27 12:29:32 -0700 |
| commit | 103207ba8f0f422214f7433e13fc3c58cdffa5ce (patch) | |
| tree | 70f97e3c49a6da477532208185a0726a6fa239dc /vp8/decoder/detokenize.h | |
| parent | 28d9202ed4d8af3eb128fa9192e6e3c4b1c9f67d (diff) | |
| parent | 771fc832f3889c067b76899c8209bd0854ba7f7d (diff) | |
| download | libvpx-103207ba8f0f422214f7433e13fc3c58cdffa5ce.tar libvpx-103207ba8f0f422214f7433e13fc3c58cdffa5ce.tar.gz libvpx-103207ba8f0f422214f7433e13fc3c58cdffa5ce.tar.bz2 libvpx-103207ba8f0f422214f7433e13fc3c58cdffa5ce.zip | |
Merge "Merge branch 'master' into experimental" into experimental
Diffstat (limited to 'vp8/decoder/detokenize.h')
| -rw-r--r-- | vp8/decoder/detokenize.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/vp8/decoder/detokenize.h b/vp8/decoder/detokenize.h index 8640bda4c..f2130b361 100644 --- a/vp8/decoder/detokenize.h +++ b/vp8/decoder/detokenize.h @@ -8,13 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ - -#ifndef DETOKENIZE_H -#define DETOKENIZE_H +#ifndef DETOKENIZE_H_ +#define DETOKENIZE_H_ #include "onyxd_int.h" void vp8_reset_mb_tokens_context(MACROBLOCKD *x); int vp8_decode_mb_tokens(VP8D_COMP *, MACROBLOCKD *); -#endif /* DETOKENIZE_H */ +#endif // DETOKENIZE_H |