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 | dd0f7a7127fdb04863b4ad66d2b846ee94358314 (patch) | |
tree | e012a5e389d776605dad8edf62b50a4ba6dc2b4d /media/libmediaplayerservice/MediaRecorderClient.cpp | |
parent | d3a3eaf5d0c88e13b8dc7154fcae8b15dcacc932 (diff) | |
parent | e83fffc032654b819774e5d94d38842bb4190c22 (diff) | |
download | frameworks_av-dd0f7a7127fdb04863b4ad66d2b846ee94358314.zip frameworks_av-dd0f7a7127fdb04863b4ad66d2b846ee94358314.tar.gz frameworks_av-dd0f7a7127fdb04863b4ad66d2b846ee94358314.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.
Diffstat (limited to 'media/libmediaplayerservice/MediaRecorderClient.cpp')
-rw-r--r-- | media/libmediaplayerservice/MediaRecorderClient.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 |