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/error_concealment.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/error_concealment.h')
| -rw-r--r-- | vp8/decoder/error_concealment.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vp8/decoder/error_concealment.h b/vp8/decoder/error_concealment.h index 65ae9d9be..fb96b3605 100644 --- a/vp8/decoder/error_concealment.h +++ b/vp8/decoder/error_concealment.h @@ -9,8 +9,8 @@ */ -#ifndef ERROR_CONCEALMENT_H -#define ERROR_CONCEALMENT_H +#ifndef ERROR_CONCEALMENT_H_ +#define ERROR_CONCEALMENT_H_ #include "onyxd_int.h" #include "ec_types.h" @@ -38,4 +38,4 @@ void vp8_interpolate_motion(MACROBLOCKD *mb, */ void vp8_conceal_corrupt_mb(MACROBLOCKD *xd); -#endif +#endif // ERROR_CONCEALMENT_H_ |