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

Commit ce48b3a8 authored by Andreas Gampe's avatar Andreas Gampe Committed by Android Git Automerger
Browse files

am f3df58c7: Merge "Stagefright: Fix unused variables" 

* commit 'f3df58c7':
  Stagefright: Fix unused variables
parents 93f5b333 f3df58c7

media/libstagefright/codecs/aacenc/basic_op/basic_op.h

+0 −3
Original line number Diff line number Diff line
@@ -518,8 +518,6 @@ __inline Word32 L_shl(Word32 L_var1, Word16 var2) 
        return  ASM_L_shr( L_var1, -var2);

    }

#else

    Word32 L_var_out = 0L;



    if (var2 <= 0)

    {

        L_var1 = L_shr(L_var1, (Word16)-var2);
@@ -540,7 +538,6 @@ __inline Word32 L_shl(Word32 L_var1, Word16 var2) 
                }

            }

            L_var1 <<= 1;

            L_var_out = L_var1;

        }

    }

    return (L_var1);

media/libstagefright/codecs/aacenc/src/block_switch.c

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ Word32 CalcWindowEnergy(BLOCK_SWITCHING_CONTROL *blockSwitchingControl, 
                        Word16 chIncrement,

                        Word16 windowLen)

{

  Word32 w, i, wOffset, tidx, ch;

  Word32 w, i, tidx;

  Word32 accuUE, accuFE;

  Word32 tempUnfiltered;

  Word32 tempFiltered;