diff options
| author | Andreas Huber <andih@google.com> | 2010-10-13 09:19:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-13 09:19:28 -0700 |
| commit | a127c07c42b8961881f460eb8e6a6b722139e3b9 (patch) | |
| tree | 1c0168e56514c3afdf64d8098f68009f6a3c54ac /media/libmedia | |
| parent | 28b93967d0e702304c7edec854a29d5ab88bfce0 (diff) | |
| parent | 312644cdbb39522fe9cac028b15b907ce0e8e0f7 (diff) | |
| download | frameworks_base-a127c07c42b8961881f460eb8e6a6b722139e3b9.zip frameworks_base-a127c07c42b8961881f460eb8e6a6b722139e3b9.tar.gz frameworks_base-a127c07c42b8961881f460eb8e6a6b722139e3b9.tar.bz2 | |
am 312644cd: Merge "Support for writing to MPEG2 transport stream files." into gingerbread
Merge commit '312644cdbb39522fe9cac028b15b907ce0e8e0f7' into gingerbread-plus-aosp
* commit '312644cdbb39522fe9cac028b15b907ce0e8e0f7':
Support for writing to MPEG2 transport stream files.
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 9d53c25..e20e3ba 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; } |