diff options
author | John Koleszar <jkoleszar@google.com> | 2013-03-27 10:41:29 -0700 |
---|---|---|
committer | John Koleszar <jkoleszar@google.com> | 2013-03-27 10:46:19 -0700 |
commit | 771fc832f3889c067b76899c8209bd0854ba7f7d (patch) | |
tree | 617379cd79f034d2ea2f709e90ab59105bbfc7cc /vp8/decoder/decodemv.h | |
parent | 513157e0939b2774db583a31fe29c9d34948e09c (diff) | |
parent | 8015a9aedc2358135940180884f0b9bba9509009 (diff) | |
download | libvpx-771fc832f3889c067b76899c8209bd0854ba7f7d.tar libvpx-771fc832f3889c067b76899c8209bd0854ba7f7d.tar.gz libvpx-771fc832f3889c067b76899c8209bd0854ba7f7d.tar.bz2 libvpx-771fc832f3889c067b76899c8209bd0854ba7f7d.zip |
Merge branch 'master' into experimental
Pick up VP8 encryption, quantization changes, and some fixes to vpxenc
Conflicts:
test/decode_test_driver.cc
test/decode_test_driver.h
test/encode_test_driver.cc
vp8/vp8cx.mk
vpxdec.c
vpxenc.c
Change-Id: I9fbcc64808ead47e22f1f22501965cc7f0c4791c
Diffstat (limited to 'vp8/decoder/decodemv.h')
-rw-r--r-- | vp8/decoder/decodemv.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/vp8/decoder/decodemv.h b/vp8/decoder/decodemv.h index 940342447..05a33d27f 100644 --- a/vp8/decoder/decodemv.h +++ b/vp8/decoder/decodemv.h @@ -8,7 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ +#ifndef DECODEMV_H_ +#define DECODEMV_H_ #include "onyxd_int.h" void vp8_decode_mode_mvs(VP8D_COMP *); + +#endif // DECODEMV_H_ |