summaryrefslogtreecommitdiff
path: root/media/libmediaplayerservice/MediaPlayerService.cpp
diff options
context:
space:
mode:
author Andreas Huber <andih@google.com> 2010-08-30 13:04:21 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2010-08-30 13:04:21 -0700
commit681c5ff2085a08835c08b97641ebdc1b37489943 (patch)
tree782b6fd4b744ce0c439e202913a4b44fc1ab43d0 /media/libmediaplayerservice/MediaPlayerService.cpp
parent858bb4f66ea1bd9c48b9817cb44a59c8b0394229 (diff)
parent30cfa20dfc67583411db58674d3d97bc42fa7951 (diff)
Merge "Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore." into gingerbread
Diffstat (limited to 'media/libmediaplayerservice/MediaPlayerService.cpp')
-rw-r--r--media/libmediaplayerservice/MediaPlayerService.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index b5972e761f54..aba5f522f171 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -737,8 +737,8 @@ player_type getPlayerType(const char* url)
if (!strncasecmp(url, "rtsp://", 7)) {
char value[PROPERTY_VALUE_MAX];
- if (!property_get("media.stagefright.enable-rtsp", value, NULL)
- || (strcmp(value, "1") && strcasecmp(value, "true"))) {
+ if (property_get("media.stagefright.enable-rtsp", value, NULL)
+ && (strcmp(value, "1") && strcasecmp(value, "true"))) {
// For now, we're going to use PV for rtsp-based playback
// by default until we can clear up a few more issues.
return PV_PLAYER;