From ad7bfddc9e4017ddd1cfcc67af494058c2b6bf02 Mon Sep 17 00:00:00 2001 From: xufuji456 <839789740@qq.com> Date: Mon, 18 Oct 2021 00:32:12 +0800 Subject: [PATCH] add __cplusplus --- app/src/main/cpp/ffmpeg/ffmpeg.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/app/src/main/cpp/ffmpeg/ffmpeg.h b/app/src/main/cpp/ffmpeg/ffmpeg.h index 1d635dc..35bddca 100644 --- a/app/src/main/cpp/ffmpeg/ffmpeg.h +++ b/app/src/main/cpp/ffmpeg/ffmpeg.h @@ -23,9 +23,6 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif #include "cmdutils.h" #include "config.h" @@ -47,9 +44,6 @@ extern "C" { #include "libavutil/threadmessage.h" #include "libswresample/swresample.h" -#ifdef __cplusplus -} -#endif #define VSYNC_AUTO -1 #define VSYNC_PASSTHROUGH 0 @@ -626,7 +620,9 @@ extern char *qsv_device; #endif extern HWDevice *filter_hw_device; - +#ifdef __cplusplus +extern "C" { +#endif void term_init(void); void term_exit(void); @@ -669,6 +665,9 @@ int hw_device_setup_for_decode(InputStream *ist); int hw_device_setup_for_encode(OutputStream *ost); int hwaccel_decode_init(AVCodecContext *avctx); +#ifdef __cplusplus +} +#endif int run(int argc, char **argv);