summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2014-12-09 18:34:49 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-09 18:34:49 +0000
commit6eb3b5205354ee41ae79abb692abb1490a8c3019 (patch)
treeb4b39f66861f6122918f8bc4e98f9964683ba789 /media
parentc1b0d49cacde26c2420528169d157d2c778a9b0d (diff)
parentf6a364ed92945bf8a39dbadddb674c3f2e3b7d53 (diff)
downloadframeworks_av-6eb3b5205354ee41ae79abb692abb1490a8c3019.zip
frameworks_av-6eb3b5205354ee41ae79abb692abb1490a8c3019.tar.gz
frameworks_av-6eb3b5205354ee41ae79abb692abb1490a8c3019.tar.bz2
am f6a364ed: Merge "Fix AAC recording issue" into lmp-mr1-dev
* commit 'f6a364ed92945bf8a39dbadddb674c3f2e3b7d53': 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 353920e..7cc9430 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() {