Message ID | tencent_66424E9670532D489A5D40069ACC9FEDAB08@qq.com |
---|---|
State | Accepted |
Commit | 1c61aa1a02d66c2abf8365aae558fd5782c7a594 |
Headers | show |
Series | [FFmpeg-devel,1/2] avdevice/android_camera: fix missing include for usleep | expand |
Context | Check | Description |
---|---|---|
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
On Sun, Sep 17, 2023 at 5:38 AM Zhao Zhili <quinkblack@foxmail.com> wrote: > From: Zhao Zhili <zhilizhao@tencent.com> > > Signed-off-by: Zhao Zhili <zhilizhao@tencent.com> > --- > libavcodec/jni.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/libavcodec/jni.c b/libavcodec/jni.c > index 85dcf2abaf..ae6490de9d 100644 > --- a/libavcodec/jni.c > +++ b/libavcodec/jni.c > @@ -34,8 +34,8 @@ > #include "libavutil/log.h" > #include "ffjni.h" > > -void *java_vm; > -pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER; > +static void *java_vm; > +static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER; > > int av_jni_set_java_vm(void *vm, void *log_ctx) > { > -- > 2.34.1 > > LGTM. Thanks, Matthieu
diff --git a/libavcodec/jni.c b/libavcodec/jni.c index 85dcf2abaf..ae6490de9d 100644 --- a/libavcodec/jni.c +++ b/libavcodec/jni.c @@ -34,8 +34,8 @@ #include "libavutil/log.h" #include "ffjni.h" -void *java_vm; -pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER; +static void *java_vm; +static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER; int av_jni_set_java_vm(void *vm, void *log_ctx) {