diff options
| author | Ronghua Wu <ronghuawu@google.com> | 2014-09-13 02:20:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-13 02:20:57 +0000 |
| commit | 7ea50388bd51cf2a45355139499314bed63e70ed (patch) | |
| tree | ad77419612d310f2d90428cacae8f520fe19d73f /media/libstagefright/colorconversion | |
| parent | 53f5b2af7541857624002a4356b0fcf1cbf65227 (diff) | |
| parent | f2b68be88f6b892539e232170091722935ae369a (diff) | |
| download | frameworks_av-7ea50388bd51cf2a45355139499314bed63e70ed.zip frameworks_av-7ea50388bd51cf2a45355139499314bed63e70ed.tar.gz frameworks_av-7ea50388bd51cf2a45355139499314bed63e70ed.tar.bz2 | |
am f2b68be8: am 98d59462: Merge "stagefright: add adaptive playback support to SoftMPEG decoder." into lmp-dev
* commit 'f2b68be88f6b892539e232170091722935ae369a':
stagefright: add adaptive playback support to SoftMPEG decoder.
Diffstat (limited to 'media/libstagefright/colorconversion')
| -rw-r--r-- | media/libstagefright/colorconversion/SoftwareRenderer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/colorconversion/SoftwareRenderer.cpp b/media/libstagefright/colorconversion/SoftwareRenderer.cpp index ac2b103..6474906 100644 --- a/media/libstagefright/colorconversion/SoftwareRenderer.cpp +++ b/media/libstagefright/colorconversion/SoftwareRenderer.cpp @@ -65,8 +65,8 @@ void SoftwareRenderer::resetFormatIfChanged(const sp<AMessage> &format) { CHECK(format->findInt32("color-format", &colorFormatNew)); int32_t widthNew, heightNew; - CHECK(format->findInt32("width", &widthNew)); - CHECK(format->findInt32("height", &heightNew)); + CHECK(format->findInt32("stride", &widthNew)); + CHECK(format->findInt32("slice-height", &heightNew)); int32_t cropLeftNew, cropTopNew, cropRightNew, cropBottomNew; if (!format->findRect( |