diff options
| author | Kenny Root <kroot@google.com> | 2010-10-14 23:58:41 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2010-10-14 23:58:41 -0700 |
| commit | 4a90f93781622e5cbca52b962cfe5325a29ec28e (patch) | |
| tree | 2215799c3d6212b9e9ad26521fdcbc447a80bc78 /media/libmedia | |
| parent | e449fceaa4b1e1c76d95a4255d23ac508bd75751 (diff) | |
| parent | a127c07c42b8961881f460eb8e6a6b722139e3b9 (diff) | |
| download | frameworks_base-4a90f93781622e5cbca52b962cfe5325a29ec28e.zip frameworks_base-4a90f93781622e5cbca52b962cfe5325a29ec28e.tar.gz frameworks_base-4a90f93781622e5cbca52b962cfe5325a29ec28e.tar.bz2 | |
resolved conflicts for merge of a127c07c to master
Change-Id: Ifdfc6681cba00f36456eaf7a97f34a75b9d0c086
Diffstat (limited to 'media/libmedia')
| -rw-r--r-- | media/libmedia/mediarecorder.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmedia/mediarecorder.cpp b/media/libmedia/mediarecorder.cpp index 51d91fe..fd575fe 100644 --- a/media/libmedia/mediarecorder.cpp +++ b/media/libmedia/mediarecorder.cpp @@ -181,7 +181,7 @@ status_t MediaRecorder::setOutputFormat(int of) LOGE("setOutputFormat called in an invalid state: %d", mCurrentState); return INVALID_OPERATION; } - if (mIsVideoSourceSet && of >= OUTPUT_FORMAT_AUDIO_ONLY_START && of != OUTPUT_FORMAT_RTP_AVP) { //first non-video output format + if (mIsVideoSourceSet && of >= OUTPUT_FORMAT_AUDIO_ONLY_START && of != OUTPUT_FORMAT_RTP_AVP && of != OUTPUT_FORMAT_MPEG2TS) { //first non-video output format LOGE("output format (%d) is meant for audio recording only and incompatible with video recording", of); return INVALID_OPERATION; } |