diff options
| author | Andreas Huber <andih@google.com> | 2010-08-30 13:06:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-30 13:06:55 -0700 |
| commit | 9aa05ec2cd6bc592074c7bd08d22db46649c7f12 (patch) | |
| tree | 19376986ef24c7606bc9da397bea5c3ccc865797 | |
| parent | 5762dc19836e332d3ac1906e5698088a128b362d (diff) | |
| parent | 681c5ff2085a08835c08b97641ebdc1b37489943 (diff) | |
| download | frameworks_base-9aa05ec2cd6bc592074c7bd08d22db46649c7f12.zip frameworks_base-9aa05ec2cd6bc592074c7bd08d22db46649c7f12.tar.gz frameworks_base-9aa05ec2cd6bc592074c7bd08d22db46649c7f12.tar.bz2 | |
am 681c5ff2: Merge "Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore." into gingerbread
Merge commit '681c5ff2085a08835c08b97641ebdc1b37489943' into gingerbread-plus-aosp
* commit '681c5ff2085a08835c08b97641ebdc1b37489943':
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 b5972e7..aba5f52 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 73862c3..19915f1 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 |