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

Commit c90be3cb authored by Guillaume Chelfi's avatar Guillaume Chelfi Committed by Automerger Merge Worker
Browse files

Merge "m4v_enc: Fix level setparam issue" am: d6386ac0 am: 43bc1319 am:... 

Merge "m4v_enc: Fix level setparam issue" am: d6386ac0 am: 43bc1319 am: 7d52c670 am: 26b224f6

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1853660

Change-Id: I2663a6a34d45079f3ff891eae5494b98c5f1b6f9
parents b248b8b3 26b224f6

media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp

+1 −1
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ OMX_ERRORTYPE SoftMPEG4Encoder::internalSetParameter( 
            }



            if (mpeg4type->eProfile != OMX_VIDEO_MPEG4ProfileCore ||

                mpeg4type->eLevel != OMX_VIDEO_MPEG4Level2 ||

                mpeg4type->eLevel > OMX_VIDEO_MPEG4Level2 ||

                (mpeg4type->nAllowedPictureTypes & OMX_VIDEO_PictureTypeB) ||

                mpeg4type->nBFrames != 0 ||

                mpeg4type->nIDCVLCThreshold != 0 ||