diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-01-14 22:14:14 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-01-14 22:14:14 +0100 |
| commit | 998f3a696f0d671832624637c771e3bda3e0c9f5 (patch) | |
| tree | 67c89508c2eaad57389ffac29d673a09bc8bfaba /media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Deemph_32_neon.s | |
| parent | 1c47b26b1ae695c355e4ec0c317716a397588206 (diff) | |
| parent | 8ad656861c764ea4f8bf8539cb568b01edbf647d (diff) | |
| download | frameworks_av-998f3a696f0d671832624637c771e3bda3e0c9f5.zip frameworks_av-998f3a696f0d671832624637c771e3bda3e0c9f5.tar.gz frameworks_av-998f3a696f0d671832624637c771e3bda3e0c9f5.tar.bz2 | |
Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_frameworks_av into replicant-6.0
Diffstat (limited to 'media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Deemph_32_neon.s')
| -rw-r--r-- | media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Deemph_32_neon.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Deemph_32_neon.s b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Deemph_32_neon.s index 1d5893f..91feea0 100644 --- a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Deemph_32_neon.s +++ b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Deemph_32_neon.s @@ -98,5 +98,5 @@ LOOP: LDMFD r13!, {r4 - r12, r15} - .END + .end |