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

Commit 40c519ed authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Gerrit Code Review
Browse files

Merge "stagefright: remove extra QCOM ifndef" into ics

parents caf1c3f6 81140b22

media/libstagefright/OMXCodec.cpp

+1 −4
Original line number Diff line number Diff line
@@ -862,13 +862,10 @@ status_t OMXCodec::configureCodec(const sp<MetaData> &meta) { 
        }



    }

#ifndef QCOM_HARDWARE

    if (!strcasecmp(MEDIA_MIMETYPE_VIDEO_DIVX, mMIME) || !strcasecmp(MEDIA_MIMETYPE_VIDEO_DIVX4, mMIME)) {

#else



    if (!strcasecmp(MEDIA_MIMETYPE_VIDEO_DIVX, mMIME) ||

        !strcasecmp(MEDIA_MIMETYPE_VIDEO_DIVX4, mMIME) ||

        !strcasecmp(MEDIA_MIMETYPE_VIDEO_DIVX311, mMIME)) {

#endif

        LOGV("Setting the QOMX_VIDEO_PARAM_DIVXTYPE params ");

        QOMX_VIDEO_PARAM_DIVXTYPE paramDivX;

        InitOMXParams(&paramDivX);