OSDN Git Service

Merge changes I46c81dba,If1f40e9c,I652eaaa5
authorJean-Baptiste Queru <jbq@google.com>
Wed, 29 Feb 2012 22:24:52 +0000 (14:24 -0800)
committerandroid code review <noreply-gerritcodereview@google.com>
Wed, 29 Feb 2012 22:24:52 +0000 (14:24 -0800)
commit9f422f59fcb74283fa52c3bfd0a2665ec9ce9e10
treef5fe8c26eca24674c88df28f57e2d6b8b3d9c78b
parentde99ee3d507bf1284fdb5d6b84a32f4227f16a6f
parentb8576d5ae50294bb1917b84f366054ebff02a3a6
Merge changes I46c81dba,If1f40e9c,I652eaaa5

* changes:
  stagefright aacenc: Use QDADD/QDSUB instructions
  stagefright aacenc: Remove useless inline asm for simple right shift
  stagefright aacenc: Use ARMv6 SSAT instruction
media/libstagefright/codecs/aacenc/basic_op/typedefs.h