Merge "NativeCryptoInfo: fix ctor invocation" into main

2023-07-19 18:31:49 +00:00
parent 87d7970730 fe3785c3ff
commit 1f108e0203
1 changed files with 1 additions and 1 deletions
--- a/media/jni/android_media_MediaCodec.cpp
+++ b/media/jni/android_media_MediaCodec.cpp
@@ -2491,7 +2491,7 @@ static void android_media_MediaCodec_native_queueLinearBlock(
            return;
        }
        auto cryptoInfo =
-                cryptoInfoObj ? NativeCryptoInfo{size} : NativeCryptoInfo{env, cryptoInfoObj};
+                cryptoInfoObj ? NativeCryptoInfo{env, cryptoInfoObj} : NativeCryptoInfo{size};
        if (env->ExceptionCheck()) {
            // Creation of cryptoInfo failed. Let the exception bubble up.
            return;