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

Commit 37dfacdf authored by Dan Stoza's avatar Dan Stoza Committed by android-build-merger
Browse files

Merge "Add cast to make room for naming pixel_format_t" am: 6d51c0c1 

am: bb3e2fcf

* commit 'bb3e2fcf':
  Add cast to make room for naming pixel_format_t
parents 35cb5634 bb3e2fcf

media/libstagefright/ACodec.cpp

+1 −1
Original line number Diff line number Diff line
@@ -3847,7 +3847,7 @@ bool ACodec::describeDefaultColorFormat(DescribeColorFormatParams &params) { 
        fmt != OMX_COLOR_FormatYUV420PackedPlanar &&

        fmt != OMX_COLOR_FormatYUV420SemiPlanar &&

        fmt != OMX_COLOR_FormatYUV420PackedSemiPlanar &&

        fmt != HAL_PIXEL_FORMAT_YV12) {

        fmt != (OMX_COLOR_FORMATTYPE)HAL_PIXEL_FORMAT_YV12) {

        ALOGW("do not know color format 0x%x = %d", fmt, fmt);

        return false;

    }