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/inc/mem_align.h | |
| parent | 1c47b26b1ae695c355e4ec0c317716a397588206 (diff) | |
| parent | 8ad656861c764ea4f8bf8539cb568b01edbf647d (diff) | |
| download | frameworks_av-replicant-6.0-alpha-0001.zip frameworks_av-replicant-6.0-alpha-0001.tar.gz frameworks_av-replicant-6.0-alpha-0001.tar.bz2 | |
Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_frameworks_av into replicant-6.0replicant-6.0-alpha-0001
Diffstat (limited to 'media/libstagefright/codecs/amrwbenc/inc/mem_align.h')
| -rw-r--r-- | media/libstagefright/codecs/amrwbenc/inc/mem_align.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/libstagefright/codecs/amrwbenc/inc/mem_align.h b/media/libstagefright/codecs/amrwbenc/inc/mem_align.h index 442786a..2ae5a6c 100644 --- a/media/libstagefright/codecs/amrwbenc/inc/mem_align.h +++ b/media/libstagefright/codecs/amrwbenc/inc/mem_align.h @@ -14,9 +14,9 @@ ** limitations under the License. */ /******************************************************************************* - File: mem_align.h + File: mem_align.h - Content: Memory alloc alignments functions + Content: Memory alloc alignments functions *******************************************************************************/ @@ -29,7 +29,7 @@ extern void *mem_malloc(VO_MEM_OPERATOR *pMemop, unsigned int size, unsigned char alignment, unsigned int CodecID); extern void mem_free(VO_MEM_OPERATOR *pMemop, void *mem_ptr, unsigned int CodecID); -#endif /* __VO_MEM_ALIGN_H__ */ +#endif /* __VO_MEM_ALIGN_H__ */ |