diff options
| author | Andreas Huber <andih@google.com> | 2009-10-08 14:39:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-08 14:39:12 -0700 |
| commit | 1c83540e3829dc9664728f1f017686f16f61a4ea (patch) | |
| tree | c2086161290e2b886fb09360d3bebf2c19c82420 /include | |
| parent | 6036288ad953e56433a9936fad09213b328cad71 (diff) | |
| parent | 2d295a9601315a2610a2cb759ed9a4f787e7d4b5 (diff) | |
| download | frameworks_base-1c83540e3829dc9664728f1f017686f16f61a4ea.zip frameworks_base-1c83540e3829dc9664728f1f017686f16f61a4ea.tar.gz frameworks_base-1c83540e3829dc9664728f1f017686f16f61a4ea.tar.bz2 | |
am 2d295a96: Merge change Iedebfe8d into eclair-mr2
Merge commit '2d295a9601315a2610a2cb759ed9a4f787e7d4b5' into eclair-mr2-plus-aosp
* commit '2d295a9601315a2610a2cb759ed9a4f787e7d4b5':
Some decoders will return an error on OMX_EmptyThisBuffer to indicate that they don't support the media format, deal with this.
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/IOMX.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/media/IOMX.h b/include/media/IOMX.h index 10e0197..e551d17 100644 --- a/include/media/IOMX.h +++ b/include/media/IOMX.h @@ -84,9 +84,9 @@ public: virtual status_t observe_node( node_id node, const sp<IOMXObserver> &observer) = 0; - virtual void fill_buffer(node_id node, buffer_id buffer) = 0; + virtual status_t fill_buffer(node_id node, buffer_id buffer) = 0; - virtual void empty_buffer( + virtual status_t empty_buffer( node_id node, buffer_id buffer, OMX_U32 range_offset, OMX_U32 range_length, |