diff options
| author | Rachad <rachad@google.com> | 2015-02-02 15:37:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-02 15:37:11 +0000 |
| commit | 82a4ca039f600569726df0326269b4ac1a78fc6c (patch) | |
| tree | e25655727edd3260fca511a3dd6b056408405a29 /include | |
| parent | d7dbf4179aa87a018d4a8a4cd0958a5ed5d7fe5f (diff) | |
| parent | a601b86287ab5437a7e9aaf6f09bc171803cdc3d (diff) | |
| download | frameworks_av-82a4ca039f600569726df0326269b4ac1a78fc6c.zip frameworks_av-82a4ca039f600569726df0326269b4ac1a78fc6c.tar.gz frameworks_av-82a4ca039f600569726df0326269b4ac1a78fc6c.tar.bz2 | |
am a601b862: am c9e11696: am 36dca156: Merge "Acodec: Send framerate information to OMX decoder if available" into lmp-mr1-dev
* commit 'a601b86287ab5437a7e9aaf6f09bc171803cdc3d':
Acodec: Send framerate information to OMX decoder if available
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/ACodec.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/stagefright/ACodec.h b/include/media/stagefright/ACodec.h index 371e2c8..8509d55 100644 --- a/include/media/stagefright/ACodec.h +++ b/include/media/stagefright/ACodec.h @@ -264,7 +264,7 @@ private: status_t setVideoFormatOnPort( OMX_U32 portIndex, int32_t width, int32_t height, - OMX_VIDEO_CODINGTYPE compressionFormat); + OMX_VIDEO_CODINGTYPE compressionFormat, float frameRate = -1.0); typedef struct drcParams { int32_t drcCut; |