summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-06-24 09:05:08 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-06-24 09:05:08 -0700
commit7bf4fab9e5590d345b93b559f35b2fb0f6b17ca8 (patch)
tree85f02ad188f4de9109bf461c03c071f44853d35d /include
parent2439a8d6d99864ba0c2d94f428e6c9ee258cdd45 (diff)
parent608d77b1cf4fb9f63dc861e4e1fa3e80a732f626 (diff)
downloadframeworks_av-7bf4fab9e5590d345b93b559f35b2fb0f6b17ca8.zip
frameworks_av-7bf4fab9e5590d345b93b559f35b2fb0f6b17ca8.tar.gz
frameworks_av-7bf4fab9e5590d345b93b559f35b2fb0f6b17ca8.tar.bz2
Merge "Remove most stagefright property overrides, remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright." into gingerbread
Diffstat (limited to 'include')
-rw-r--r--include/media/MediaPlayerInterface.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/media/MediaPlayerInterface.h b/include/media/MediaPlayerInterface.h
index 9e606d9..3662983 100644
--- a/include/media/MediaPlayerInterface.h
+++ b/include/media/MediaPlayerInterface.h
@@ -39,7 +39,6 @@ template<typename T> class SortedVector;
enum player_type {
PV_PLAYER = 1,
SONIVOX_PLAYER = 2,
- VORBIS_PLAYER = 3,
STAGEFRIGHT_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