diff options
| author | Andreas Huber <andih@google.com> | 2010-08-05 11:46:04 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-05 11:46:04 -0700 |
| commit | 982a93173bc84f005172152d823cbb59dfcbeb12 (patch) | |
| tree | 2ef94049c4daadc6b4da5a3d6c93c04d99d08d05 /media/libmedia | |
| parent | aa68b49a53a874a1813e65752663f19d18149e2c (diff) | |
| parent | 347d3c1dabd7ae9c998a024c685de2001e0ff369 (diff) | |
| download | frameworks_av-982a93173bc84f005172152d823cbb59dfcbeb12.zip frameworks_av-982a93173bc84f005172152d823cbb59dfcbeb12.tar.gz frameworks_av-982a93173bc84f005172152d823cbb59dfcbeb12.tar.bz2 | |
am 1f513d88: am c17f35dd: Merge "Support for Gtalk video, includes AMR/H.263 assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation." into gingerbread
Merge commit '1f513d8821670a33d6361ea521b6756163a3f9bf'
* commit '1f513d8821670a33d6361ea521b6756163a3f9bf':
Support for Gtalk video, includes AMR/H.263 assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation.
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 5adc116..9d53c25 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) { //first non-video output format + if (mIsVideoSourceSet && of >= OUTPUT_FORMAT_AUDIO_ONLY_START && of != OUTPUT_FORMAT_RTP_AVP) { //first non-video output format LOGE("output format (%d) is meant for audio recording only and incompatible with video recording", of); return INVALID_OPERATION; } |