Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 691358ac authored by Marco Nelissen's avatar Marco Nelissen Committed by Android (Google) Code Review
Browse files

Merge "Don't CHECK for unknown fourcc" into pi-dev

parents 7b56f7cc 6225516c
Loading
Loading
Loading
Loading
+7 −2
Original line number Diff line number Diff line
@@ -321,8 +321,13 @@ static const char *FourCC2MIME(uint32_t fourcc) {
        case FOURCC('h', 'e', 'v', '1'):
            return MEDIA_MIMETYPE_VIDEO_HEVC;
        default:
            CHECK(!"should not be here.");
            return NULL;
            ALOGW("Unknown fourcc: %c%c%c%c",
                   (fourcc >> 24) & 0xff,
                   (fourcc >> 16) & 0xff,
                   (fourcc >> 8) & 0xff,
                   fourcc & 0xff
                   );
            return "application/octet-stream";
    }
}