diff options
| author | Lajos Molnar <lajos@google.com> | 2015-02-04 20:54:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-04 20:54:00 +0000 |
| commit | 7b66f713fc53ee81453763788c02f3c741d19520 (patch) | |
| tree | 3d0d35ea132cae45a53600cdd32a4807bd7675a8 /media/libstagefright/OMXCodec.cpp | |
| parent | 5d46bd54a279f24d0476b83947ce29e786b5c72c (diff) | |
| parent | 57f75272fcd16b205ed60cdd0b33ffc19991fd10 (diff) | |
| download | frameworks_av-7b66f713fc53ee81453763788c02f3c741d19520.zip frameworks_av-7b66f713fc53ee81453763788c02f3c741d19520.tar.gz frameworks_av-7b66f713fc53ee81453763788c02f3c741d19520.tar.bz2 | |
am 57f75272: Merge "stagefright: add support for native flex-YUV formats" into lmp-mr1-dev
* commit '57f75272fcd16b205ed60cdd0b33ffc19991fd10':
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 f26563e..6da00e6 100644 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -4540,7 +4540,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) { |