summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChih-hung Hsieh <chh@google.com>2014-11-20 20:45:47 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-20 20:45:47 +0000
commitd60486723cdc0b4b83b77d57ce35023a7516c471 (patch)
treeaccb1a450988ec00ac64a2c0eb5bd3b5a96d518c
parentcd370c790a9017560874a2588da46d4538087cad (diff)
parent9d2e0daedd2c55314d60dd4620e66eccf4b0ca0b (diff)
downloadframeworks_av-d60486723cdc0b4b83b77d57ce35023a7516c471.zip
frameworks_av-d60486723cdc0b4b83b77d57ce35023a7516c471.tar.gz
frameworks_av-d60486723cdc0b4b83b77d57ce35023a7516c471.tar.bz2
am 9d2e0dae: Merge "Remove extraneous parentheses"
* commit '9d2e0daedd2c55314d60dd4620e66eccf4b0ca0b': Remove extraneous parentheses
-rw-r--r--media/libstagefright/codecs/m4v_h263/enc/src/vlc_encode.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/m4v_h263/enc/src/vlc_encode.cpp b/media/libstagefright/codecs/m4v_h263/enc/src/vlc_encode.cpp
index 7ea5dc4..2aec815 100644
--- a/media/libstagefright/codecs/m4v_h263/enc/src/vlc_encode.cpp
+++ b/media/libstagefright/codecs/m4v_h263/enc/src/vlc_encode.cpp
@@ -271,7 +271,7 @@ PutCBPY(Int cbpy, Char intra, BitstreamEncVideo *bitstream)
Int ind;
Int length;
- if ((intra == 0))
+ if (intra == 0)
cbpy = 15 - cbpy;
ind = cbpy;