diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-16 15:31:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-16 15:31:15 -0700 |
| commit | fa172b0d2dcd761622b61701b7c7dd4d0f19610b (patch) | |
| tree | a62306737201b8724ac8a05507a6e47492c92987 /media/libstagefright/codecs | |
| parent | ce088d274b4530fb813a030216d675b0e7262711 (diff) | |
| parent | eeb9fde0cb8e0ace44eb720bcac272ee70282d4d (diff) | |
| download | frameworks_av-fa172b0d2dcd761622b61701b7c7dd4d0f19610b.zip frameworks_av-fa172b0d2dcd761622b61701b7c7dd4d0f19610b.tar.gz frameworks_av-fa172b0d2dcd761622b61701b7c7dd4d0f19610b.tar.bz2 | |
am eeb9fde0: am 3f5d2e17: Merge "aacenc/amrwbenc: Remove unused and dubious typedefs"
* commit 'eeb9fde0cb8e0ace44eb720bcac272ee70282d4d':
aacenc/amrwbenc: Remove unused and dubious typedefs
Diffstat (limited to 'media/libstagefright/codecs')
| -rw-r--r-- | media/libstagefright/codecs/common/include/voType.h | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/media/libstagefright/codecs/common/include/voType.h b/media/libstagefright/codecs/common/include/voType.h index 5f659ab..da208d4 100644 --- a/media/libstagefright/codecs/common/include/voType.h +++ b/media/libstagefright/codecs/common/include/voType.h @@ -76,15 +76,6 @@ typedef char VO_CHAR; /** VO_U16 is a 16 bit unsigned quantity that is 16 bit word aligned */ typedef unsigned short VO_U16; -/** VO_WCHAR is a 16 bit unsigned quantity that is 16 bit word aligned */ -#if defined _WIN32 -typedef unsigned short VO_WCHAR; -typedef unsigned short* VO_PWCHAR; -#elif defined LINUX -typedef unsigned char VO_WCHAR; -typedef unsigned char* VO_PWCHAR; -#endif - /** VO_S16 is a 16 bit signed quantity that is 16 bit word aligned */ typedef signed short VO_S16; @@ -150,21 +141,6 @@ typedef char* VO_PCHAR; */ typedef unsigned char* VO_PBYTE; -/** The VO_PTCHAR type is intended to be used to pass arrays of wchar such as - unicode char between the application and the component and core. The VO_PTCHAR - type is a 32 bit pointer to a zero terminated string. The pointer is word - aligned and the string is byte aligned. - */ -/* -#if !defined LINUX -typedef unsigned short* VO_PTCHAR; -typedef unsigned short* VO_TCHAR; -#else -typedef char* VO_PTCHAR; -typedef char VO_TCHAR; -#endif -*/ - #ifndef NULL #ifdef __cplusplus #define NULL 0 |