diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-11-13 02:24:07 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-11-13 02:24:07 -0800 |
| commit | 6c6f283bfee003b32843c0d4cec19604b6875927 (patch) | |
| tree | bad1ef33140c5ef5bffd39e533511e23c577c2c6 /media/libmediaplayerservice/nuplayer/NuPlayer.h | |
| parent | 60282213a1194ee8753ac53b97fc7f7e36373e17 (diff) | |
| parent | 6ab73dcdc410e873a585af3a0e0ffd1551c06f2e (diff) | |
| download | frameworks_av-6c6f283bfee003b32843c0d4cec19604b6875927.zip frameworks_av-6c6f283bfee003b32843c0d4cec19604b6875927.tar.gz frameworks_av-6c6f283bfee003b32843c0d4cec19604b6875927.tar.bz2 | |
Merge "nuplayer: don't resume if player is reseting."
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayer.h')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayer.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.h b/media/libmediaplayerservice/nuplayer/NuPlayer.h index c0aa782..32a3efe 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayer.h +++ b/media/libmediaplayerservice/nuplayer/NuPlayer.h @@ -202,6 +202,7 @@ protected: AVSyncSettings mSyncSettings; float mVideoFpsHint; bool mStarted; + bool mResetting; bool mSourceStarted; // Actual pause state, either as requested by client or due to buffering. |