- Timestamp:
- Mar 11, 2013 6:32:58 AM (11 years ago)
- Location:
- pjproject/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk
- Property svn:mergeinfo changed
/pjproject/branches/projects/android (added) merged: 4153,4192-4195,4202,4211,4215,4221-4222,4226,4231,4237,4250,4284,4286-4287,4289,4292
- Property svn:mergeinfo changed
-
pjproject/trunk/pjmedia/include/pjmedia-audiodev/config.h
r4432 r4435 56 56 # define PJMEDIA_AUDIO_DEV_HAS_PORTAUDIO 1 57 57 # endif 58 #endif 59 60 /** 61 * This setting controls whether Android OpenSL audio support should be 62 * included. 63 */ 64 #ifndef PJMEDIA_AUDIO_DEV_HAS_OPENSL 65 # define PJMEDIA_AUDIO_DEV_HAS_OPENSL 0 66 #endif 67 68 /** 69 * This setting controls whether Android JNI audio support should be 70 * included. 71 */ 72 #ifndef PJMEDIA_AUDIO_DEV_HAS_ANDROID_JNI 73 # define PJMEDIA_AUDIO_DEV_HAS_ANDROID_JNI 0 58 74 #endif 59 75
Note: See TracChangeset
for help on using the changeset viewer.