summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2014-12-09 18:17:52 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-12-09 18:17:53 +0000
commitf6a364ed92945bf8a39dbadddb674c3f2e3b7d53 (patch)
treeb4b39f66861f6122918f8bc4e98f9964683ba789 /media
parent82a69ea8b090d57bff5e02774688b546a711bbb8 (diff)
parent9fa3db9a8c164daaf0d7334595dbd0ca24fe97bf (diff)
downloadframeworks_av-f6a364ed92945bf8a39dbadddb674c3f2e3b7d53.zip
frameworks_av-f6a364ed92945bf8a39dbadddb674c3f2e3b7d53.tar.gz
frameworks_av-f6a364ed92945bf8a39dbadddb674c3f2e3b7d53.tar.bz2
Merge "Fix AAC recording issue" into lmp-mr1-dev
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() {