diff options
author | Steve Kondik <steve@cyngn.com> | 2015-11-29 21:21:15 -0800 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2015-11-29 21:21:15 -0800 |
commit | c85eb5757f55a1a0bb4737971335d410733c5d05 (patch) | |
tree | 2195fbe1e389e66fc745c7735eec75c2cbc3b188 /media/libmediaplayerservice/nuplayer/NuPlayer.h | |
parent | 3f54b2b7dcdfec8870565588b5e63e93dc5b363d (diff) | |
parent | 7936537049c7f389cddc5ad4d815a5119b589853 (diff) | |
download | frameworks_av-c85eb5757f55a1a0bb4737971335d410733c5d05.zip frameworks_av-c85eb5757f55a1a0bb4737971335d410733c5d05.tar.gz frameworks_av-c85eb5757f55a1a0bb4737971335d410733c5d05.tar.bz2 |
Merge branch 'LA.BF64.1.2.2_rb4.8' of git://codeaurora.org/platform/frameworks/av into cm-13.0
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 1f4dec8..ee0f3e6 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayer.h +++ b/media/libmediaplayerservice/nuplayer/NuPlayer.h @@ -281,7 +281,7 @@ protected: void writeTrackInfo(Parcel* reply, const sp<AMessage> format) const; - void tearDownPCMOffload(const sp<AMessage> &msg); + void performTearDown(const sp<AMessage> &msg); DISALLOW_EVIL_CONSTRUCTORS(NuPlayer); }; |