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 | e4edd632d48720b44f7878273f46d192d5703150 (patch) | |
| tree | 4dc92f8f6371da457d7c20e59194e73cf66d3659 /media/libmedia | |
| parent | 43024e1f4953d9b8891b7b72f10e76f11812e772 (diff) | |
| parent | 5cb77e080ced5362b5f047e107327b3cb6ece6c9 (diff) | |
| download | frameworks_av-e4edd632d48720b44f7878273f46d192d5703150.tar.gz frameworks_av-e4edd632d48720b44f7878273f46d192d5703150.tar.bz2 frameworks_av-e4edd632d48720b44f7878273f46d192d5703150.zip | |
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 9d53c257e9..e20e3bab64 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; } |