diff options
| author | Andy Hung <hunga@google.com> | 2014-12-08 19:14:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-08 19:14:22 +0000 |
| commit | 5f480891e5818f111f431ae69b4c1354e302242a (patch) | |
| tree | c7f086960b8b81108c8bac4f4c3ec5c3874b1586 /media/libmediaplayerservice/nuplayer/NuPlayer.h | |
| parent | 3202a2dc337a3f4eb5410781e35f1ca0a1428615 (diff) | |
| parent | 4c56f8e0329cbdd0f3406bde96fc6f0bba65664d (diff) | |
| download | frameworks_av-5f480891e5818f111f431ae69b4c1354e302242a.zip frameworks_av-5f480891e5818f111f431ae69b4c1354e302242a.tar.gz frameworks_av-5f480891e5818f111f431ae69b4c1354e302242a.tar.bz2 | |
am 4c56f8e0: am b65842dd: Merge "Fix NuPlayer assertion on failure to create AudioTrack" into lmp-mr1-dev
* commit '4c56f8e0329cbdd0f3406bde96fc6f0bba65664d':
Fix NuPlayer assertion on failure to create AudioTrack
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayer.h')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.h b/media/libmediaplayerservice/nuplayer/NuPlayer.h index c64b32f..bb32eac 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayer.h +++ b/media/libmediaplayerservice/nuplayer/NuPlayer.h @@ -188,7 +188,7 @@ private: mFlushComplete[1][1] = false; } - void openAudioSink(const sp<AMessage> &format, bool offloadOnly); + void tryOpenAudioSinkForOffload(const sp<AMessage> &format, bool hasVideo); void closeAudioSink(); status_t instantiateDecoder(bool audio, sp<DecoderBase> *decoder); |