summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-08-21 10:15:00 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-21 10:15:00 -0700
commit8d4d590dcbbd2b178976d0bd024625e9d6216365 (patch)
tree63b0c5ec268f2971724cd846aaa9cc8fee4bcee8 /media
parent8a825ec079da6f2b89149c53568cb9721c10d923 (diff)
parent1e75e9721254ae5df05c3d88b30ed7f778406261 (diff)
downloadframeworks_av-8d4d590dcbbd2b178976d0bd024625e9d6216365.zip
frameworks_av-8d4d590dcbbd2b178976d0bd024625e9d6216365.tar.gz
frameworks_av-8d4d590dcbbd2b178976d0bd024625e9d6216365.tar.bz2
am 1e75e972: Merge "avcenc: Update a comment about the inline assembly"
* commit '1e75e9721254ae5df05c3d88b30ed7f778406261': avcenc: Update a comment about the inline assembly
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/codecs/avc/enc/src/sad_halfpel_inline.h3
-rw-r--r--media/libstagefright/codecs/avc/enc/src/sad_inline.h3
-rw-r--r--media/libstagefright/codecs/avc/enc/src/sad_mb_offset.h3
3 files changed, 3 insertions, 6 deletions
diff --git a/media/libstagefright/codecs/avc/enc/src/sad_halfpel_inline.h b/media/libstagefright/codecs/avc/enc/src/sad_halfpel_inline.h
index 0c5a5a3..22f545a 100644
--- a/media/libstagefright/codecs/avc/enc/src/sad_halfpel_inline.h
+++ b/media/libstagefright/codecs/avc/enc/src/sad_halfpel_inline.h
@@ -24,8 +24,7 @@ extern "C"
{
#endif
-/* Intentionally not using the gcc asm version, since it (if fixed so
- * as to not crash - the current register constraints are faulty) is
+/* Intentionally not using the gcc asm version, since it is
* slightly slower than the plain C version on modern GCC versions. */
#if !defined(__CC_ARM) /* Generic C version */
diff --git a/media/libstagefright/codecs/avc/enc/src/sad_inline.h b/media/libstagefright/codecs/avc/enc/src/sad_inline.h
index a540d86..47abc65 100644
--- a/media/libstagefright/codecs/avc/enc/src/sad_inline.h
+++ b/media/libstagefright/codecs/avc/enc/src/sad_inline.h
@@ -23,8 +23,7 @@ extern "C"
{
#endif
-/* Intentionally not using the gcc asm version, since it (if fixed so
- * as to not crash - the current register constraints are faulty) is
+/* Intentionally not using the gcc asm version, since it is
* slightly slower than the plain C version on modern GCC versions. */
#if !defined(__CC_ARM) /* Generic C version */
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 33297ab..20ca7eb 100644
--- a/media/libstagefright/codecs/avc/enc/src/sad_mb_offset.h
+++ b/media/libstagefright/codecs/avc/enc/src/sad_mb_offset.h
@@ -16,8 +16,7 @@
* -------------------------------------------------------------------
*/
-/* Intentionally not using the gcc asm version, since it (if fixed so
- * as to not crash - the current register constraints are faulty) is
+/* Intentionally not using the gcc asm version, since it is
* slightly slower than the plain C version on modern GCC versions. */
#if !defined(__CC_ARM) /* Generic C version */