diff options
| author | Andreas Huber <andih@google.com> | 2009-10-29 14:00:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-29 14:00:16 -0700 |
| commit | 5647eebc3aeef6e644b8c7587a36206d8f0d6314 (patch) | |
| tree | 625e585b362639d2e020f9d319c3387bffd95550 /include | |
| parent | cad9a4b0468eb9611cc9b7d7b380d8af3fff8588 (diff) | |
| parent | 9dba1f928021450f101013e03deacc9a0506772e (diff) | |
| download | frameworks_base-5647eebc3aeef6e644b8c7587a36206d8f0d6314.zip frameworks_base-5647eebc3aeef6e644b8c7587a36206d8f0d6314.tar.gz frameworks_base-5647eebc3aeef6e644b8c7587a36206d8f0d6314.tar.bz2 | |
am 9dba1f92: Merge change Ib482ce88 into eclair-mr2
Merge commit '9dba1f928021450f101013e03deacc9a0506772e' into eclair-mr2-plus-aosp
* commit '9dba1f928021450f101013e03deacc9a0506772e':
Revive support for video encoding in OMXCodec.
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/OMXCodec.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/media/stagefright/OMXCodec.h b/include/media/stagefright/OMXCodec.h index d0f4f17..7890883 100644 --- a/include/media/stagefright/OMXCodec.h +++ b/include/media/stagefright/OMXCodec.h @@ -158,6 +158,8 @@ private: void setVideoInputFormat( const char *mime, OMX_U32 width, OMX_U32 height); + status_t setupMPEG4EncoderParameters(); + void setVideoOutputFormat( const char *mime, OMX_U32 width, OMX_U32 height); |