1 files changed, 11 insertions, 3 deletions
diff --git a/chromium/third_party/libvpx/source/libvpx/vp8/decoder/error_concealment.h b/chromium/third_party/libvpx/source/libvpx/vp8/decoder/error_concealment.h
index fb96b3605ec..9a1e024865d 100644
--- a/chromium/third_party/libvpx/source/libvpx/vp8/decoder/error_concealment.h
+++ b/chromium/third_party/libvpx/source/libvpx/vp8/decoder/error_concealment.h
@@ -9,12 +9,16 @@
  */
 
 
-#ifndef ERROR_CONCEALMENT_H_
-#define ERROR_CONCEALMENT_H_
+#ifndef VP8_DECODER_ERROR_CONCEALMENT_H_
+#define VP8_DECODER_ERROR_CONCEALMENT_H_
 
 #include "onyxd_int.h"
 #include "ec_types.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Allocate memory for the overlap lists */
 int vp8_alloc_overlap_lists(VP8D_COMP *pbi);
 
@@ -38,4 +42,8 @@ void vp8_interpolate_motion(MACROBLOCKD *mb,
  */
 void vp8_conceal_corrupt_mb(MACROBLOCKD *xd);
 
-#endif  // ERROR_CONCEALMENT_H_
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // VP8_DECODER_ERROR_CONCEALMENT_H_