diff mbox series

[FFmpeg-devel] avcodec/jni: fix mixed declaration and code

Message ID 20240404200725.155067-1-matthieu.bouron@gmail.com
State Accepted
Commit 8cdf1bae942c29a39a9b921449f6dc77cd17f3ba
Headers show
Series [FFmpeg-devel] avcodec/jni: fix mixed declaration and code | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Matthieu Bouron April 4, 2024, 8:07 p.m. UTC 
---
 libavcodec/jni.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Matthieu Bouron April 15, 2024, 5:02 p.m. UTC | #1 
On Thu, Apr 04, 2024 at 10:07:25PM +0200, Matthieu Bouron wrote:
> ---
>  libavcodec/jni.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/libavcodec/jni.c b/libavcodec/jni.c
> index 1193c608c3..fcb4837413 100644
> --- a/libavcodec/jni.c
> +++ b/libavcodec/jni.c
> @@ -84,11 +84,13 @@ void *av_jni_get_java_vm(void *log_ctx)
>  int av_jni_set_android_app_ctx(void *app_ctx, void *log_ctx)
>  {
>  #if CONFIG_JNI
> +    jobjectRefType type;
> +
>      JNIEnv *env = ff_jni_get_env(log_ctx);
>      if (!env)
>          return AVERROR(EINVAL);
>  
> -    jobjectRefType type = (*env)->GetObjectRefType(env, app_ctx);
> +    type = (*env)->GetObjectRefType(env, app_ctx);
>      if (type != JNIGlobalRefType) {
>          av_log(log_ctx, AV_LOG_ERROR, "Application context must be passed as a global reference");
>          return AVERROR(EINVAL);
> -- 
> 2.44.0
> 

I will apply the patch in a few days if there is no objection.
Matthieu Bouron April 21, 2024, 7:47 a.m. UTC | #2 
On Mon, Apr 15, 2024 at 07:02:36PM +0200, Matthieu Bouron wrote:
> On Thu, Apr 04, 2024 at 10:07:25PM +0200, Matthieu Bouron wrote:
> > ---
> >  libavcodec/jni.c | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> > 
> > diff --git a/libavcodec/jni.c b/libavcodec/jni.c
> > index 1193c608c3..fcb4837413 100644
> > --- a/libavcodec/jni.c
> > +++ b/libavcodec/jni.c
> > @@ -84,11 +84,13 @@ void *av_jni_get_java_vm(void *log_ctx)
> >  int av_jni_set_android_app_ctx(void *app_ctx, void *log_ctx)
> >  {
> >  #if CONFIG_JNI
> > +    jobjectRefType type;
> > +
> >      JNIEnv *env = ff_jni_get_env(log_ctx);
> >      if (!env)
> >          return AVERROR(EINVAL);
> >  
> > -    jobjectRefType type = (*env)->GetObjectRefType(env, app_ctx);
> > +    type = (*env)->GetObjectRefType(env, app_ctx);
> >      if (type != JNIGlobalRefType) {
> >          av_log(log_ctx, AV_LOG_ERROR, "Application context must be passed as a global reference");
> >          return AVERROR(EINVAL);
> > -- 
> > 2.44.0
> > 
> 
> I will apply the patch in a few days if there is no objection.

Patch applied.
diff mbox series

Patch

diff --git a/libavcodec/jni.c b/libavcodec/jni.c
index 1193c608c3..fcb4837413 100644
--- a/libavcodec/jni.c
+++ b/libavcodec/jni.c
@@ -84,11 +84,13 @@  void *av_jni_get_java_vm(void *log_ctx)
 int av_jni_set_android_app_ctx(void *app_ctx, void *log_ctx)
 {
 #if CONFIG_JNI
+    jobjectRefType type;
+
     JNIEnv *env = ff_jni_get_env(log_ctx);
     if (!env)
         return AVERROR(EINVAL);
 
-    jobjectRefType type = (*env)->GetObjectRefType(env, app_ctx);
+    type = (*env)->GetObjectRefType(env, app_ctx);
     if (type != JNIGlobalRefType) {
         av_log(log_ctx, AV_LOG_ERROR, "Application context must be passed as a global reference");
         return AVERROR(EINVAL);