ref: 02b2c167751052de1b3b38115dfe09c86313bcf5
parent: 9f233fc5a1ef0e3db5659245a5b4bdff75e968c9
parent: a6a997d2296566a95421acffb6133cb99b2985db
author: Jim Bankoski <jimbankoski@google.com>
date: Wed Aug 13 06:54:33 EDT 2014
Merge "vpx_internal_error -> fix -Wunused-function issues"
--- a/vpx/internal/vpx_codec_internal.h
+++ b/vpx/internal/vpx_codec_internal.h
@@ -431,28 +431,10 @@
jmp_buf jmp;
};
-static void vpx_internal_error(struct vpx_internal_error_info *info,
- vpx_codec_err_t error,
- const char *fmt,
- ...) {- va_list ap;
-
- info->error_code = error;
- info->has_detail = 0;
-
- if (fmt) {- size_t sz = sizeof(info->detail);
-
- info->has_detail = 1;
- va_start(ap, fmt);
- vsnprintf(info->detail, sz - 1, fmt, ap);
- va_end(ap);
- info->detail[sz - 1] = '\0';
- }
-
- if (info->setjmp)
- longjmp(info->jmp, info->error_code);
-}
+void vpx_internal_error(struct vpx_internal_error_info *info,
+ vpx_codec_err_t error,
+ const char *fmt,
+ ...);
#ifdef __cplusplus
} // extern "C"
--- a/vpx/src/vpx_codec.c
+++ b/vpx/src/vpx_codec.c
@@ -134,3 +134,26 @@
return SAVE_STATUS(ctx, res);
}
+
+void vpx_internal_error(struct vpx_internal_error_info *info,
+ vpx_codec_err_t error,
+ const char *fmt,
+ ...) {+ va_list ap;
+
+ info->error_code = error;
+ info->has_detail = 0;
+
+ if (fmt) {+ size_t sz = sizeof(info->detail);
+
+ info->has_detail = 1;
+ va_start(ap, fmt);
+ vsnprintf(info->detail, sz - 1, fmt, ap);
+ va_end(ap);
+ info->detail[sz - 1] = '\0';
+ }
+
+ if (info->setjmp)
+ longjmp(info->jmp, info->error_code);
+}