diff options
| author | Ronghua Wu <ronghuawu@google.com> | 2014-09-12 19:44:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-12 19:44:34 +0000 |
| commit | f2b68be88f6b892539e232170091722935ae369a (patch) | |
| tree | 29df67b046fe3a3a7a82944896dfcffef66e0c1a /media/libstagefright/colorconversion | |
| parent | 44122ffcf1fe24dfec960d9dea4257734496660b (diff) | |
| parent | 98d594620365088e05c4e5925bb00bf065b8caa1 (diff) | |
| download | frameworks_av-f2b68be88f6b892539e232170091722935ae369a.zip frameworks_av-f2b68be88f6b892539e232170091722935ae369a.tar.gz frameworks_av-f2b68be88f6b892539e232170091722935ae369a.tar.bz2 | |
am 98d59462: Merge "stagefright: add adaptive playback support to SoftMPEG decoder." into lmp-dev
* commit '98d594620365088e05c4e5925bb00bf065b8caa1':
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 cc98da0..1899b40 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( |