summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2014-02-07 15:36:10 -0800
committerAndreas Huber <andih@google.com>2014-02-11 11:41:07 -0800
commit84333e0475bc911adc16417f4ca327c975cf6c36 (patch)
tree4973c505d7c73d883c2cd796bc66ba96312c4a7a /media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp
parent1d6fa7af1288b550faabe4ec2cf98684236723db (diff)
downloadframeworks_av-84333e0475bc911adc16417f4ca327c975cf6c36.zip
frameworks_av-84333e0475bc911adc16417f4ca327c975cf6c36.tar.gz
frameworks_av-84333e0475bc911adc16417f4ca327c975cf6c36.tar.bz2
warnings be gone.
Change-Id: Ie3bae3f037730e316d7fca12e7a3527973f752ef
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp')
-rw-r--r--media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp b/media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp
index ac2aab8..cbedf5c 100644
--- a/media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp
@@ -139,7 +139,7 @@ status_t NuPlayer::HTTPLiveSource::selectTrack(size_t trackIndex, bool select) {
// LiveSession::selectTrack returns BAD_VALUE when selecting the currently
// selected track, or unselecting a non-selected track. In this case it's an
// no-op so we return OK.
- return (err == OK || err == BAD_VALUE) ? OK : err;
+ return (err == OK || err == BAD_VALUE) ? (status_t)OK : err;
}
status_t NuPlayer::HTTPLiveSource::seekTo(int64_t seekTimeUs) {