diff options
| author | Rachad <rachad@google.com> | 2015-01-31 21:54:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-31 21:54:30 +0000 |
| commit | c9e11696c4f80e9803f7e65e29af962f199a574d (patch) | |
| tree | 37a4da4c2cb9e39809014cc7f3e0e1b0478ad91e /include | |
| parent | c37a6e6bbe038cf94d11abdb6f8003e7476e11af (diff) | |
| parent | 36dca156e0b5bf1865d1f6a1c692c71e10583481 (diff) | |
| download | frameworks_av-c9e11696c4f80e9803f7e65e29af962f199a574d.zip frameworks_av-c9e11696c4f80e9803f7e65e29af962f199a574d.tar.gz frameworks_av-c9e11696c4f80e9803f7e65e29af962f199a574d.tar.bz2 | |
am 36dca156: Merge "Acodec: Send framerate information to OMX decoder if available" into lmp-mr1-dev
* commit '36dca156e0b5bf1865d1f6a1c692c71e10583481':
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; |