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/libmediaplayerservice/StagefrightRecorder.h | |
| 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/libmediaplayerservice/StagefrightRecorder.h')
| -rw-r--r-- | media/libmediaplayerservice/StagefrightRecorder.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/StagefrightRecorder.h b/media/libmediaplayerservice/StagefrightRecorder.h index 039bc16..7d2549f 100644 --- a/media/libmediaplayerservice/StagefrightRecorder.h +++ b/media/libmediaplayerservice/StagefrightRecorder.h @@ -118,6 +118,7 @@ private: status_t startAMRRecording(); status_t startAACRecording(); status_t startRTPRecording(); + status_t startMPEG2TSRecording(); sp<MediaSource> createAudioSource(); status_t checkVideoEncoderCapabilities(); status_t setupCameraSource(sp<CameraSource> *cameraSource); |