diff options
| author | Chih-hung Hsieh <chh@google.com> | 2014-11-18 18:58:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-18 18:58:49 +0000 |
| commit | 3126b50345a9fc0e5d6d9e58226795735e04932f (patch) | |
| tree | a28f6fc4fc27093871afb036baf5fd5491a27423 /media/libstagefright/codecs | |
| parent | b08869a45c78d3a9cfdbc9d220b5d491076c5c7f (diff) | |
| parent | 5f3eef9a6a946347bc7d8c5dc76290c9e780f818 (diff) | |
| download | frameworks_av-3126b50345a9fc0e5d6d9e58226795735e04932f.zip frameworks_av-3126b50345a9fc0e5d6d9e58226795735e04932f.tar.gz frameworks_av-3126b50345a9fc0e5d6d9e58226795735e04932f.tar.bz2 | |
am 5f3eef9a: am 7a200235: Merge "Remove extraneous parentheses"
* commit '5f3eef9a6a946347bc7d8c5dc76290c9e780f818':
Remove extraneous parentheses
Diffstat (limited to 'media/libstagefright/codecs')
| -rw-r--r-- | media/libstagefright/codecs/aacenc/src/bitenc.c | 2 | ||||
| -rw-r--r-- | media/libstagefright/codecs/amrwbenc/src/wb_vad.c | 2 |
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; |