diff options
| author | Andreas Huber <andih@google.com> | 2010-08-30 13:30:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-30 13:30:35 -0700 |
| commit | 2527da00e2dc0f6f52e85abc6b4a09611a8ec16d (patch) | |
| tree | 8df2afb627ddf7a224fe83db15e087c28284b1a4 | |
| parent | 9d01dcbdf2d747cf7d434c12954b672245e3a986 (diff) | |
| parent | 9aa05ec2cd6bc592074c7bd08d22db46649c7f12 (diff) | |
| download | frameworks_base-2527da00e2dc0f6f52e85abc6b4a09611a8ec16d.zip frameworks_base-2527da00e2dc0f6f52e85abc6b4a09611a8ec16d.tar.gz frameworks_base-2527da00e2dc0f6f52e85abc6b4a09611a8ec16d.tar.bz2 | |
am 9aa05ec2: am 681c5ff2: Merge "Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore." into gingerbread
Merge commit '9aa05ec2cd6bc592074c7bd08d22db46649c7f12'
* commit '9aa05ec2cd6bc592074c7bd08d22db46649c7f12':
Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore.
| -rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.cpp | 4 | ||||
| -rw-r--r-- | media/libmediaplayerservice/MediaRecorderClient.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index d9b0c69..ffe1983 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; diff --git a/media/libmediaplayerservice/MediaRecorderClient.cpp b/media/libmediaplayerservice/MediaRecorderClient.cpp index 7e05043..96519e6 100644 --- a/media/libmediaplayerservice/MediaRecorderClient.cpp +++ b/media/libmediaplayerservice/MediaRecorderClient.cpp @@ -295,8 +295,8 @@ MediaRecorderClient::MediaRecorderClient(const sp<MediaPlayerService>& service, mPid = pid; char value[PROPERTY_VALUE_MAX]; - if (property_get("media.stagefright.enable-record", value, NULL) - && (!strcmp(value, "1") || !strcasecmp(value, "true"))) { + if (!property_get("media.stagefright.enable-record", value, NULL) + || !strcmp(value, "1") || !strcasecmp(value, "true")) { mRecorder = new StagefrightRecorder; } else #ifndef NO_OPENCORE |