diff options
| author | Andreas Huber <andih@google.com> | 2010-10-12 14:17:45 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2010-10-12 16:05:23 -0700 |
| commit | 9adf466021d37a5062d7d3361e14bfd9e7ffeba6 (patch) | |
| tree | 32065c7763d46863e76d9f78ba4c76f0117ff2dc /media/libmedia | |
| parent | a7c76d8307a3b49bf5b8fdda3543455b0e5dd64c (diff) | |
| download | frameworks_base-9adf466021d37a5062d7d3361e14bfd9e7ffeba6.zip frameworks_base-9adf466021d37a5062d7d3361e14bfd9e7ffeba6.tar.gz frameworks_base-9adf466021d37a5062d7d3361e14bfd9e7ffeba6.tar.bz2 | |
Support for writing to MPEG2 transport stream files.
Change-Id: If3b7a807bc224a4b1cb2236537c3ebdc5aee0d97
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; } |