commit 49ae1e4a8c721f3c03085b5ce0bb8f873a224115
author Greg Kaiser <gkaiser@google.com> Thu Mar 23 17:11:28 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 23 17:11:28 2023 +0000
tree b96a478a76f2d0b3dfaac8f0adae1f2668d22134
parent a84d8900f822d6a02e5ad164d5683499de26c8f8
parent 6ca9ee663a5580b0e1a03b74718bcf6c49b1630a

Merge "Fix null check" into udc-dev

media/libstagefright/colorconversion/ColorConverter.cpp

diff --git a/media/libstagefright/colorconversion/ColorConverter.cpp b/media/libstagefright/colorconversion/ColorConverter.cpp
index 06d5680..9d2568e 100644
--- a/media/libstagefright/colorconversion/ColorConverter.cpp
+++ b/media/libstagefright/colorconversion/ColorConverter.cpp
@@ -281,7 +281,7 @@
         size_t *u_stride,
         size_t *v_stride) const {
 
-    if (y_offset == nullptr || v_offset == nullptr || v_offset == nullptr
+    if (y_offset == nullptr || u_offset == nullptr || v_offset == nullptr
             || y_stride == nullptr || u_stride == nullptr || v_stride == nullptr) {
         return ERROR_UNSUPPORTED;
     }