[droidmedia] Fix Jolla C build. JB#55092

Halium · Aug 17, 2021 · 73cb2f7 · 73cb2f7
1 parent 2d80398
commit 73cb2f7
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/droidmediacodec.cpp b/droidmediacodec.cpp
@@ -774,12 +774,14 @@ unsigned int droid_media_codec_get_supported_color_formats(const char *mime, int
 
     if (matchIndex >= 0) {
         const android::sp<android::MediaCodecInfo> info = list->getCodecInfo(matchIndex);
-        if (info != nullptr) {
+        if (info != NULL) {
             const android::sp<android::MediaCodecInfo::Capabilities> caps = info->getCapabilitiesFor(mime);
-            if (caps != nullptr) {
+            if (caps != NULL) {
                 android::Vector<uint32_t> colorFormats;
                 caps->getSupportedColorFormats(&colorFormats);
-                maxFormats = std::min<unsigned int>(maxFormats, colorFormats.size());
+                if (maxFormats > colorFormats.size()) {
+                    maxFormats = colorFormats.size();
+                }
                 for (unsigned int i = 0; i < maxFormats; i++) {
                     formats[i] = colorFormats.itemAt(i);
                 }