summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/MediaPlayerService.cpp
diff options
context:
space:
mode:
authorMingming Yin <mingming@codeaurora.org>2015-07-08 18:23:52 -0700
committerLinux Build Service Account <lnxbuild@localhost>2015-10-06 03:24:13 -0600
commit2d846a1474e999db2a09ab00bb92e1b6079a0573 (patch)
treef689c133d1c9ab0e1b206c797595386cb7f80d67 /media/libmediaplayerservice/MediaPlayerService.cpp
parentf48b75f9c6407a2e5b361ec57cefd812404eb02d (diff)
downloadframeworks_av-2d846a1474e999db2a09ab00bb92e1b6079a0573.zip
frameworks_av-2d846a1474e999db2a09ab00bb92e1b6079a0573.tar.gz
frameworks_av-2d846a1474e999db2a09ab00bb92e1b6079a0573.tar.bz2
stagefright: Disable AwesomePlayer
Permanently remove StagefrightPlayer codebase & remove its entry from MediaPlayerFactory as AwesomePlayer is completely replaced by NuPlayer. Keep the AwesomePlayer codebase to make libstagefright_timedtext available to NuPlayer via libstagefright. Conflicts: media/libmediaplayerservice/MediaPlayerFactory.cpp Change-Id: Idfecdc519919ee940817c7bb515433fc37588bd3
Diffstat (limited to 'media/libmediaplayerservice/MediaPlayerService.cpp')
-rw-r--r--media/libmediaplayerservice/MediaPlayerService.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index d550bfc..dbe8b31 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -74,7 +74,6 @@
#include "MediaPlayerFactory.h"
#include "TestPlayerStub.h"
-#include "StagefrightPlayer.h"
#include "nuplayer/NuPlayerDriver.h"
#include <OMX.h>