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 | 1318864fa7ce6c85aaf629b1db08c79e4d0cf41e (patch) | |
| tree | 0a55adab2711acd93131bf933dd5b8f638c2a7d9 /include/media | |
| parent | e71ffeb7e0eaa181130aaaad18a94ef3ab73ecb1 (diff) | |
| parent | 0209da1cb177888af6c58e9bcc13c5d9665d6354 (diff) | |
| download | frameworks_base-1318864fa7ce6c85aaf629b1db08c79e4d0cf41e.zip frameworks_base-1318864fa7ce6c85aaf629b1db08c79e4d0cf41e.tar.gz frameworks_base-1318864fa7ce6c85aaf629b1db08c79e4d0cf41e.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/media')
| -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); |