From patchwork Thu Apr 4 20:07:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu Bouron X-Patchwork-Id: 47808 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp558160pzd; Thu, 4 Apr 2024 13:08:02 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXIY+zpHtC/YnaQFYGLxSo/MWqYzQuz9drrdaBqYJI2ub4RAeRxrB7IYKNpFmtBC41SMPBtBh+MTd26eX7yVvrN7obGN4WfhscV7w== X-Google-Smtp-Source: AGHT+IGjp8d8bcw8+eX5k5qyXlFak66cx1ZFWy1g9WbzEm/vh1xgdc8XYpDW55uvUIxWMcvnavGn X-Received: by 2002:a05:6512:510:b0:516:ced5:3af9 with SMTP id o16-20020a056512051000b00516ced53af9mr1442513lfb.5.1712261281773; Thu, 04 Apr 2024 13:08:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712261281; cv=none; d=google.com; s=arc-20160816; b=cZLjz4EowpMmFCqejBaMtQDA3K47ihS6PwUJFaWDlxk0RQgmaOKYY4qa/oDnsGs6Az PxqUdPlaWTozy9bP7T4q9oS57IMi0XNAvazLfbF4KUZQzddh3i+m8kEwVOwIkF1LY3c9 zI5ram9pjUo+YQaXlIvocpoRj1qa6w5sLqeNhWDa3K718RyjitTqN0biKhXcKMVDVhIS 1NHxaW4LmuzY8naRxIlKEtXCPjVZLVsxtRrtGoJXZ914+aIpQBxeuk1JTrFqEStfpmBO 1n8pfGwwafwOlnKiuAa7pn18MO1ce85c4ibVTEQmiEEKrVrHekWwnxtj6LqDUIwZ7hAp NgHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=x8MVnyX6XEgPulCyg0mEtFhaqx3Z3PAUzcANnPVN0lg=; fh=bsOL+ub9JEnfNazRgCdgjxJAChubFVskZxBzYcxeDLU=; b=kmI1CEkh6Fqzjp/HslIHeMoU4Cf9F8JiPkclfVLVRJ9SbfGU99eAtMPTYg7e4ELKuv qW6UWoCosUwo6wpvJzW+J5CXsYXV9mBdnfxdQZHYaJ5w3nJpUkyKkyMgiFZhx1FLMWEv 9i4x2cZgvm5f4cVlDTaM0hjz3Ba7smt0N4/65z+cVna1PRuz0wyhwfo0+Tp3lsZGZ8MC g6dHgBUSpWhpy5Fs7djOd68EMR1YYsUJBUJ3yTHzZMHzGXeSEzjnuiZnvZPBxT+auGfG A7kuuFRPulucvw9aDXd/FUvMzt0g5eOvoD4vIr7uYYHsOACEhQGAy+Fl31g0Qqm0CYNI dQTQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=NxKSItJz; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a10-20020a17090640ca00b00a472e032d75si8415716ejk.991.2024.04.04.13.08.01; Thu, 04 Apr 2024 13:08:01 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=NxKSItJz; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 505A368D13D; Thu, 4 Apr 2024 23:07:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C718268CFDA for ; Thu, 4 Apr 2024 23:07:51 +0300 (EEST) Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-6ecf406551aso700868b3a.2 for ; Thu, 04 Apr 2024 13:07:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712261270; x=1712866070; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=IjDRxYgNRtVacNZIAvH3lC+w7Kc/UZPSZpjlFT8yv5Y=; b=NxKSItJzuoO+JBhIwxfJf0+G8AgYNPvIToaRmCjcX1TK3cwnb3RK8B70WzYOkdj5AN fm5w/YvOt/uLJYdnhNcF+RJfsLZJ5K7WtlkLxqRsJjlah2in9axPE+w5+ozTtSCBMexH OMx0T3etZopRXppemcN7RuyRRZDjXAjexjoT9+OpywuDB9e4UB/P4qRJ5FWBVQBJb2u2 diqNEqvm+UKSrHeBJJzOWL5VeeDHnHo6yVdcy0dMH/BpCWUPrFL6y+5oGOT9J5m/p3z4 g9MyWmVj0jteu9UsBaarOLNsMk+Dob4gL95uGnJBn0++5xBgtOZxTQQV/He1qrFfdFhf Jnhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712261270; x=1712866070; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=IjDRxYgNRtVacNZIAvH3lC+w7Kc/UZPSZpjlFT8yv5Y=; b=eDLLhIrmO3+kGmYE0zZSrDNWLcHExQB8ddOn4Asjd/TTSIdguEG7tgPlrfPeVO+Z1e tKVA53FkGWnDKLnEyRNcD+k81qd8+LkXASJ73toAfTCWXWSFMWtENoT9rmdSP7bgJTEO FDb5mt/doliXGtCxERI0m39LuwZHy2hjMWVhslz5b3addtoVr1tCrzfPEAoBMgoCa2Ie awdlwqA6D6kWbX1e68xg8TVb9Ee/DXZ9h94LbhQ+q8qDVZW7EEHsff3v61i6p93s4O/p rdg0mxDlTsOV1BD2vEAoHGQIhzuJo0BCmLmqFb+eaL0pGG5foI5KEbMfX16ln4vN87Om MxAg== X-Gm-Message-State: AOJu0YxGCPaXg0/Zaytp/YPk+oBlaKxgYoNeBGoNjaLwcm0chmQLuuyi 6bf9GDjdcBf9k8QoR5uCLiTAIhk5IPm2b7AASr5q8w1VH87OYqIQ83dG5Hj2 X-Received: by 2002:a05:6a00:1145:b0:6ec:d950:fd59 with SMTP id b5-20020a056a00114500b006ecd950fd59mr704340pfm.29.1712261269896; Thu, 04 Apr 2024 13:07:49 -0700 (PDT) Received: from localhost.localdomain (2a01cb040b6872000000000000000afa.ipv6.abo.wanadoo.fr. [2a01:cb04:b68:7200::afa]) by smtp.gmail.com with ESMTPSA id f34-20020a056a000b2200b006ea918dab9csm29570pfu.157.2024.04.04.13.07.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Apr 2024 13:07:49 -0700 (PDT) From: Matthieu Bouron To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Apr 2024 22:07:25 +0200 Message-ID: <20240404200725.155067-1-matthieu.bouron@gmail.com> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/jni: fix mixed declaration and code X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Matthieu Bouron Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: xAUtfYxzHYP3 --- 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);