summaryrefslogtreecommitdiff
path: root/include/media/MediaPlayerInterface.h
diff options
context:
space:
mode:
author Andreas Huber <andih@google.com> 2010-12-15 15:22:29 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2010-12-15 15:22:29 -0800
commita84b4805f0a265193793c15c5254564cb916ef17 (patch)
tree846a410867fe1cacb04756d938f69612e6649314 /include/media/MediaPlayerInterface.h
parentf57b00b3d5cb5a9ad73310bb80bdb7f45a353ef4 (diff)
parenta15874665fa785c82afa9f2e8cb3512470c297cb (diff)
Merge "Initial support for a true streaming player for mpeg2 transport streams."
Diffstat (limited to 'include/media/MediaPlayerInterface.h')
-rw-r--r--include/media/MediaPlayerInterface.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/media/MediaPlayerInterface.h b/include/media/MediaPlayerInterface.h
index e7f1d6dd6e4a..c0963a662383 100644
--- a/include/media/MediaPlayerInterface.h
+++ b/include/media/MediaPlayerInterface.h
@@ -40,7 +40,8 @@ template<typename T> class SortedVector;
enum player_type {
PV_PLAYER = 1,
SONIVOX_PLAYER = 2,
- STAGEFRIGHT_PLAYER = 4,
+ STAGEFRIGHT_PLAYER = 3,
+ NU_PLAYER = 4,
// Test players are available only in the 'test' and 'eng' builds.
// The shared library with the test player is passed passed as an
// argument to the 'test:' url in the setDataSource call.