diff options
| author | Lajos Molnar <lajos@google.com> | 2015-02-04 21:11:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-04 21:11:33 +0000 |
| commit | 3b5d119522bdf9c23be622be395d7a95d465616e (patch) | |
| tree | 9f7e695fabcdf8f849b2be640903ae635c16a18e /media/libstagefright/OMXCodec.cpp | |
| parent | e91c3dd028c6cf551e905c5d2cfb5d1fc0c8bcb7 (diff) | |
| parent | 7b66f713fc53ee81453763788c02f3c741d19520 (diff) | |
| download | frameworks_av-3b5d119522bdf9c23be622be395d7a95d465616e.zip frameworks_av-3b5d119522bdf9c23be622be395d7a95d465616e.tar.gz frameworks_av-3b5d119522bdf9c23be622be395d7a95d465616e.tar.bz2 | |
am 7b66f713: am 57f75272: Merge "stagefright: add support for native flex-YUV formats" into lmp-mr1-dev
* commit '7b66f713fc53ee81453763788c02f3c741d19520':
stagefright: add support for native flex-YUV formats
Diffstat (limited to 'media/libstagefright/OMXCodec.cpp')
| -rw-r--r-- | media/libstagefright/OMXCodec.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index 69f4989..ea19ab2 100644 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -4538,7 +4538,8 @@ status_t QueryCodec( OMX_U32 flexibleEquivalent; if (ACodec::isFlexibleColorFormat( - omx, node, portFormat.eColorFormat, &flexibleEquivalent)) { + omx, node, portFormat.eColorFormat, false /* usingNativeWindow */, + &flexibleEquivalent)) { bool marked = false; for (size_t i = 0; i < caps->mColorFormats.size(); i++) { if (caps->mColorFormats.itemAt(i) == flexibleEquivalent) { |