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/libmediaplayerservice/StagefrightRecorder.h | |
| parent | 43024e1f4953d9b8891b7b72f10e76f11812e772 (diff) | |
| parent | 5cb77e080ced5362b5f047e107327b3cb6ece6c9 (diff) | |
| download | frameworks_av-e4edd632d48720b44f7878273f46d192d5703150.zip frameworks_av-e4edd632d48720b44f7878273f46d192d5703150.tar.gz frameworks_av-e4edd632d48720b44f7878273f46d192d5703150.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/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 216f6bc..ad0dfa0 100644 --- a/media/libmediaplayerservice/StagefrightRecorder.h +++ b/media/libmediaplayerservice/StagefrightRecorder.h @@ -102,6 +102,7 @@ private: status_t startAMRRecording(); status_t startAACRecording(); status_t startRTPRecording(); + status_t startMPEG2TSRecording(); sp<MediaSource> createAudioSource(); status_t setupCameraSource(); status_t setupAudioEncoder(const sp<MediaWriter>& writer); |