summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-19 20:41:24 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-07-19 20:41:24 +0000
commit3e4cb76551b4ab703c5104df2c538c4596d298b6 (patch)
tree1fe5a808a94a43f093655d24a5882ee4f2e3e84a
parent671e39e9060d53cd4d00c4b2d105910d0f78fb65 (diff)
parent462a09b6cfda05cb5476f0089e49e7314779e25f (diff)
Merge "Merge "NativeCryptoInfo: fix ctor invocation" into main am: 1f108e0203 am: 7c4ae57f9c" into udc-dev-plus-aosp
-rw-r--r--media/jni/android_media_MediaCodec.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/jni/android_media_MediaCodec.cpp b/media/jni/android_media_MediaCodec.cpp
index dea7f03d369a..5ea98c0c6700 100644
--- a/media/jni/android_media_MediaCodec.cpp
+++ b/media/jni/android_media_MediaCodec.cpp
@@ -2615,7 +2615,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;