diff options
| author | Jianhong Jiang <jianhong@google.com> | 2009-04-13 19:01:51 -0700 |
|---|---|---|
| committer | Jianhong Jiang <jianhong@google.com> | 2009-04-13 19:01:51 -0700 |
| commit | 3ca47d101db63b619f15723d5131ff7bc8f3a5be (patch) | |
| tree | 4ab8372a383766376e2ad02ccbdec7557dc4b218 /media/jni/android_media_AmrInputStream.cpp | |
| parent | a8e947f604281197b77e8a9171a9d1fa3d274703 (diff) | |
| download | frameworks_base-3ca47d101db63b619f15723d5131ff7bc8f3a5be.zip frameworks_base-3ca47d101db63b619f15723d5131ff7bc8f3a5be.tar.gz frameworks_base-3ca47d101db63b619f15723d5131ff7bc8f3a5be.tar.bz2 | |
Squashed commit of the following:
commit b6cf47306b642f7cf7e1b55cce448e0deff38f36
Author: Jianhong Jiang <jianhong@google.com>
Date: Mon Apr 13 11:07:01 2009 -0700
Change tabs into 4 spaces.
commit 93c5890dbcc68e37aa0ef039b4a203acddca8968
Author: Jianhong Jiang <jianhong@google.com>
Date: Fri Apr 10 14:15:23 2009 -0700
OpenCore 2.02 related changes.
Diffstat (limited to 'media/jni/android_media_AmrInputStream.cpp')
| -rw-r--r-- | media/jni/android_media_AmrInputStream.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/jni/android_media_AmrInputStream.cpp b/media/jni/android_media_AmrInputStream.cpp index 978c110..51cb6c7 100644 --- a/media/jni/android_media_AmrInputStream.cpp +++ b/media/jni/android_media_AmrInputStream.cpp @@ -74,7 +74,7 @@ static void android_media_AmrInputStream_GsmAmrEncoderInitialize encodeProps.iInNumChannels = 1; encodeProps.iInInterleaveMode = TEncodeProperties::EINTERLEAVE_LR; encodeProps.iMode = CPvGsmAmrEncoder::GSM_AMR_12_2; - encodeProps.iBitStreamFormatIf2 = false; + encodeProps.iBitStreamFormat = false; encodeProps.iAudioObjectType = 0; encodeProps.iOutSamplingRate = encodeProps.iInSamplingRate; encodeProps.iOutNumChannels = encodeProps.iInNumChannels; |