diff options
| author | James Dong <jdong@google.com> | 2011-09-14 17:42:22 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-14 17:42:22 -0700 |
| commit | 5dc2812abddde309234edc786a541d251c4f820a (patch) | |
| tree | f4c077a42c5577d4fc9b098583a021f67382ba3e /include | |
| parent | 6de6b48237423a65ec041288c90e3f78fd3fce48 (diff) | |
| parent | 9a5e04438df742c297c5dbcdb60e6fd4d8f8321d (diff) | |
| download | frameworks_av-5dc2812abddde309234edc786a541d251c4f820a.zip frameworks_av-5dc2812abddde309234edc786a541d251c4f820a.tar.gz frameworks_av-5dc2812abddde309234edc786a541d251c4f820a.tar.bz2 | |
Merge "Change an assert failure due to unsupported level by HW AVC decoder and report the error to applications"
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/OMXCodec.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/stagefright/OMXCodec.h b/include/media/stagefright/OMXCodec.h index 2932744..8baf5ec 100644 --- a/include/media/stagefright/OMXCodec.h +++ b/include/media/stagefright/OMXCodec.h @@ -303,7 +303,7 @@ private: bool flushPortAsync(OMX_U32 portIndex); void disablePortAsync(OMX_U32 portIndex); - void enablePortAsync(OMX_U32 portIndex); + status_t enablePortAsync(OMX_U32 portIndex); static size_t countBuffersWeOwn(const Vector<BufferInfo> &buffers); static bool isIntermediateState(State state); |