summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2014-12-09 23:48:09 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-09 23:48:09 +0000
commita1ded198ab2cceb07353a6dd42783e8c8dfdb03f (patch)
tree35912617b7378afc4ca47b7ce1a90058d36493bd /media
parent8593c3b74b059861fdaa6ca6a913597849fe9ae1 (diff)
parentbe6a91d9e09ca33c9f3d7821c5809ce87dd57ae4 (diff)
downloadframeworks_av-a1ded198ab2cceb07353a6dd42783e8c8dfdb03f.zip
frameworks_av-a1ded198ab2cceb07353a6dd42783e8c8dfdb03f.tar.gz
frameworks_av-a1ded198ab2cceb07353a6dd42783e8c8dfdb03f.tar.bz2
am be6a91d9: am 6eb3b520: am f6a364ed: Merge "Fix AAC recording issue" into lmp-mr1-dev
* commit 'be6a91d9e09ca33c9f3d7821c5809ce87dd57ae4': Fix AAC recording issue
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/AACWriter.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libstagefright/AACWriter.cpp b/media/libstagefright/AACWriter.cpp
index 74f22cf..2e41d80 100644
--- a/media/libstagefright/AACWriter.cpp
+++ b/media/libstagefright/AACWriter.cpp
@@ -61,7 +61,8 @@ AACWriter::AACWriter(int fd)
mPaused(false),
mResumed(false),
mChannelCount(-1),
- mSampleRate(-1) {
+ mSampleRate(-1),
+ mAACProfile(OMX_AUDIO_AACObjectLC) {
}
AACWriter::~AACWriter() {