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 | f9f083e2853740c97588f4db82c24645ae5880e4 (patch) | |
| tree | 5d045dddcf9e85e4826286c28662050b9d4a935d /media/libmedia | |
| parent | d6119356f45c9c57cac812357d969ecc3001087e (diff) | |
| parent | e4edd632d48720b44f7878273f46d192d5703150 (diff) | |
| download | frameworks_av-f9f083e2853740c97588f4db82c24645ae5880e4.zip frameworks_av-f9f083e2853740c97588f4db82c24645ae5880e4.tar.gz frameworks_av-f9f083e2853740c97588f4db82c24645ae5880e4.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; } |