summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-08-08 13:15:39 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-08 13:15:39 -0700
commit2d8f9d4a3378775ce0b4fda0a61101f686e37ae9 (patch)
treeededf30368a4aa8e18b70fdf01b62856da024405
parent9708722dca3c87a69ef9d56523a8b76ce5afd198 (diff)
parent6f29245e6e4b882bb01e2ee9b120469df27970b2 (diff)
downloadframeworks_av-2d8f9d4a3378775ce0b4fda0a61101f686e37ae9.zip
frameworks_av-2d8f9d4a3378775ce0b4fda0a61101f686e37ae9.tar.gz
frameworks_av-2d8f9d4a3378775ce0b4fda0a61101f686e37ae9.tar.bz2
am 6f29245e: am 93f902d5: am 96d18cca: am 0822156c: Merge "avcenc: Fix indentation"
* commit '6f29245e6e4b882bb01e2ee9b120469df27970b2': avcenc: Fix indentation
-rw-r--r--media/libstagefright/codecs/avc/enc/src/sad_mb_offset.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/codecs/avc/enc/src/sad_mb_offset.h b/media/libstagefright/codecs/avc/enc/src/sad_mb_offset.h
index d5d4a42..5bc5c86 100644
--- a/media/libstagefright/codecs/avc/enc/src/sad_mb_offset.h
+++ b/media/libstagefright/codecs/avc/enc/src/sad_mb_offset.h
@@ -296,9 +296,9 @@ __asm__ volatile("LDR %0, [%1], #16": "=&r"(x12), "=r"(blk));
#if (NUMBER==3)
goto LOOP_SAD3;
#elif (NUMBER==2)
-goto LOOP_SAD2;
+ goto LOOP_SAD2;
#elif (NUMBER==1)
-goto LOOP_SAD1;
+ goto LOOP_SAD1;
#endif
}