summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2014-12-09 18:40:19 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-09 18:40:19 +0000
commitbe6a91d9e09ca33c9f3d7821c5809ce87dd57ae4 (patch)
tree3afb28ca10a8c6c8e632384baad0af7faf0e3e93 /media
parent33cc5c91e4bb9152ed122afacf7423e085420ac8 (diff)
parent6eb3b5205354ee41ae79abb692abb1490a8c3019 (diff)
downloadframeworks_av-be6a91d9e09ca33c9f3d7821c5809ce87dd57ae4.zip
frameworks_av-be6a91d9e09ca33c9f3d7821c5809ce87dd57ae4.tar.gz
frameworks_av-be6a91d9e09ca33c9f3d7821c5809ce87dd57ae4.tar.bz2
am 6eb3b520: am f6a364ed: Merge "Fix AAC recording issue" into lmp-mr1-dev
* commit '6eb3b5205354ee41ae79abb692abb1490a8c3019': 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() {