diff options
author | Robert Shih <robertshih@google.com> | 2014-11-19 01:50:02 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-19 01:50:02 +0000 |
commit | 2f65ada84cced6704e8fcdb03835fe218d917fcb (patch) | |
tree | 5b3ed87e8df74722a71c0b9076740fc1c86d6dc2 /media/libmediaplayerservice/nuplayer/NuPlayerSource.h | |
parent | bfa77b5c687f217e26267693306aaa6cc8a63672 (diff) | |
parent | 993d57ec4817922e291e2d88d690559403a1bcd6 (diff) | |
download | frameworks_av-2f65ada84cced6704e8fcdb03835fe218d917fcb.zip frameworks_av-2f65ada84cced6704e8fcdb03835fe218d917fcb.tar.gz frameworks_av-2f65ada84cced6704e8fcdb03835fe218d917fcb.tar.bz2 |
am 993d57ec: Merge "NuPlayer: pass media time to selectTrack for responsiveness" into lmp-mr1-dev
* commit '993d57ec4817922e291e2d88d690559403a1bcd6':
NuPlayer: pass media time to selectTrack for responsiveness
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayerSource.h')
-rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerSource.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerSource.h b/media/libmediaplayerservice/nuplayer/NuPlayerSource.h index 2f06c31..2b0ac47 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerSource.h +++ b/media/libmediaplayerservice/nuplayer/NuPlayerSource.h @@ -97,7 +97,7 @@ struct NuPlayer::Source : public AHandler { return INVALID_OPERATION; } - virtual status_t selectTrack(size_t /* trackIndex */, bool /* select */) { + virtual status_t selectTrack(size_t /* trackIndex */, bool /* select */, int64_t /* timeUs*/) { return INVALID_OPERATION; } |