summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorChih-hung Hsieh <chh@google.com>2014-11-18 18:49:14 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-11-18 18:49:14 +0000
commit7a20023576f48f06407a6ad1f016eec1943817ce (patch)
treea407f72524f63bf8cdd7606f46014450fc763eb9 /media
parent48b447fe4e2dd1e3c121b614f745a7aa03f1535a (diff)
parent54cdefc7c79c60514d3c37458df285547f4008fd (diff)
downloadframeworks_av-7a20023576f48f06407a6ad1f016eec1943817ce.zip
frameworks_av-7a20023576f48f06407a6ad1f016eec1943817ce.tar.gz
frameworks_av-7a20023576f48f06407a6ad1f016eec1943817ce.tar.bz2
Merge "Remove extraneous parentheses"
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/codecs/aacenc/src/bitenc.c2
-rw-r--r--media/libstagefright/codecs/amrwbenc/src/wb_vad.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/codecs/aacenc/src/bitenc.c b/media/libstagefright/codecs/aacenc/src/bitenc.c
index d1fd647..9c81204 100644
--- a/media/libstagefright/codecs/aacenc/src/bitenc.c
+++ b/media/libstagefright/codecs/aacenc/src/bitenc.c
@@ -547,7 +547,7 @@ static void writeFillElement( const UWord8 *ancBytes,
totFillBits = totFillBits - (3+4);
- if ((cnt == (1<<4)-1)) {
+ if (cnt == (1<<4)-1) {
esc_count = min( ((totFillBits >> 3) - ((1<<4)-1)), (1<<8)-1);
WriteBits(hBitStream,esc_count,8);
diff --git a/media/libstagefright/codecs/amrwbenc/src/wb_vad.c b/media/libstagefright/codecs/amrwbenc/src/wb_vad.c
index 13dd2aa..2beaefd 100644
--- a/media/libstagefright/codecs/amrwbenc/src/wb_vad.c
+++ b/media/libstagefright/codecs/amrwbenc/src/wb_vad.c
@@ -404,7 +404,7 @@ static void noise_estimate_update(
alpha_down = ALPHA_DOWN1;
} else
{
- if ((st->stat_count == 0))
+ if (st->stat_count == 0)
{
alpha_up = ALPHA_UP2;
alpha_down = ALPHA_DOWN2;