summaryrefslogtreecommitdiffstats
path: root/libvpx/vp8/encoder/mr_dissim.h
diff options
context:
space:
mode:
authorVignesh Venkatasubramanian <vigneshv@google.com>2014-03-10 09:50:31 -0700
committerVignesh Venkatasubramanian <vigneshv@google.com>2014-03-11 10:04:38 -0700
commitb08e2e23eec181e9951df33cd704ac294c5407b6 (patch)
tree8efc1ca8af18169b44e505ea3ac1d224c1d777ab /libvpx/vp8/encoder/mr_dissim.h
parentf0ceed9d146017d218d64ca946d5c2b31356389b (diff)
downloadandroid_external_libvpx-b08e2e23eec181e9951df33cd704ac294c5407b6.tar.gz
android_external_libvpx-b08e2e23eec181e9951df33cd704ac294c5407b6.tar.bz2
android_external_libvpx-b08e2e23eec181e9951df33cd704ac294c5407b6.zip
libvpx: Roll latest libvpx and enable VP9 Encoder
Rolling latest libvpx from upstream and generating configurations with VP9 Encoder enabled. Updating a mistake in UPDATING file. Upstream Hash: 1f08824d6db735e4cacb0419785a789395e42b2b Change-Id: Ie2c45e2253ade4a9ce88ca640cae39a7ece2d8f4
Diffstat (limited to 'libvpx/vp8/encoder/mr_dissim.h')
-rw-r--r--libvpx/vp8/encoder/mr_dissim.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/libvpx/vp8/encoder/mr_dissim.h b/libvpx/vp8/encoder/mr_dissim.h
index f8cb135..5a59ce6 100644
--- a/libvpx/vp8/encoder/mr_dissim.h
+++ b/libvpx/vp8/encoder/mr_dissim.h
@@ -9,12 +9,20 @@
*/
-#ifndef __INC_MR_DISSIM_H
-#define __INC_MR_DISSIM_H
+#ifndef VP8_ENCODER_MR_DISSIM_H_
+#define VP8_ENCODER_MR_DISSIM_H_
#include "vpx_config.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
extern void vp8_cal_low_res_mb_cols(VP8_COMP *cpi);
extern void vp8_cal_dissimilarity(VP8_COMP *cpi);
extern void vp8_store_drop_frame_info(VP8_COMP *cpi);
+#ifdef __cplusplus
+} // extern "C"
#endif
+
+#endif // VP8_ENCODER_MR_DISSIM_H_