summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2014-11-25 19:03:24 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-25 19:03:24 +0000
commitdf0b3e0c0406f277796322d0a61c6abcb12650ea (patch)
treed0cdd64a54f1a6246eb53c3cd8ad6396031633a8 /media/libstagefright
parent70d4f7f44da0f95514d0cfb404874e780ea62be5 (diff)
parent865449b4619c7cd9b75bcf7f75a42f0de68f1f00 (diff)
downloadframeworks_av-df0b3e0c0406f277796322d0a61c6abcb12650ea.zip
frameworks_av-df0b3e0c0406f277796322d0a61c6abcb12650ea.tar.gz
frameworks_av-df0b3e0c0406f277796322d0a61c6abcb12650ea.tar.bz2
am 865449b4: am e4f6ecb9: Merge "Stagefright: Fix default typo"
* commit '865449b4619c7cd9b75bcf7f75a42f0de68f1f00': Stagefright: Fix default typo
Diffstat (limited to 'media/libstagefright')
-rw-r--r--media/libstagefright/timedtext/TimedTextDriver.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/timedtext/TimedTextDriver.cpp b/media/libstagefright/timedtext/TimedTextDriver.cpp
index 71aa21e..55a9803 100644
--- a/media/libstagefright/timedtext/TimedTextDriver.cpp
+++ b/media/libstagefright/timedtext/TimedTextDriver.cpp
@@ -133,7 +133,7 @@ status_t TimedTextDriver::selectTrack(size_t index) {
}
mPlayer->start();
break;
- defaut:
+ default:
TRESPASS();
}
return ret;
@@ -181,7 +181,7 @@ status_t TimedTextDriver::seekToAsync(int64_t timeUs) {
case PLAYING:
mPlayer->seekToAsync(timeUs);
return OK;
- defaut:
+ default:
TRESPASS();
}
return UNKNOWN_ERROR;