diff options
| author | James Dong <jdong@google.com> | 2012-09-14 10:05:51 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-14 10:05:52 -0700 |
| commit | 2637cb172105939052d8a02f4eea693a90549518 (patch) | |
| tree | a95a7a5257094bd303e184a2ab35cb9add4b462f /include | |
| parent | d8421c54dc00d637e41689004edcb06caaa40b62 (diff) | |
| parent | 8fa80e3be63ffde5ef029afa713877440856b663 (diff) | |
| download | frameworks_av-2637cb172105939052d8a02f4eea693a90549518.zip frameworks_av-2637cb172105939052d8a02f4eea693a90549518.tar.gz frameworks_av-2637cb172105939052d8a02f4eea693a90549518.tar.bz2 | |
Merge "Allow OMXCodec to specify an output color format for OMX decoder component" into jb-mr1-dev
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 e6739ae..583c3b3 100644 --- a/include/media/stagefright/OMXCodec.h +++ b/include/media/stagefright/OMXCodec.h @@ -276,7 +276,7 @@ private: CodecProfileLevel& profileLevel); status_t setVideoOutputFormat( - const char *mime, OMX_U32 width, OMX_U32 height); + const char *mime, const sp<MetaData>& meta); void setImageOutputFormat( OMX_COLOR_FORMATTYPE format, OMX_U32 width, OMX_U32 height); |