diff options
| author | Andreas Huber <andih@google.com> | 2011-12-01 10:22:19 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-01 10:22:19 -0800 |
| commit | f8ebb32d1fa8fc521f47d83ffa77e20ded066c45 (patch) | |
| tree | 50b87e59a11c1df4a59fec70a749ffcb27cd019a /media | |
| parent | 89b262990fc82b1b928519744b1640ead406f110 (diff) | |
| parent | 10526a0bfe070ac4d1e550a81ed68be35d261b16 (diff) | |
| download | frameworks_base-f8ebb32d1fa8fc521f47d83ffa77e20ded066c45.zip frameworks_base-f8ebb32d1fa8fc521f47d83ffa77e20ded066c45.tar.gz frameworks_base-f8ebb32d1fa8fc521f47d83ffa77e20ded066c45.tar.bz2 | |
am 10526a0b: am 2c2ed7be: Merge "Fixes a typo in AVIExtractor that would advertise the wrong video dimensions" into ics-mr1
* commit '10526a0bfe070ac4d1e550a81ed68be35d261b16':
Fixes a typo in AVIExtractor that would advertise the wrong video dimensions
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/AVIExtractor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/AVIExtractor.cpp b/media/libstagefright/AVIExtractor.cpp index 058d10c..142fa5b 100644 --- a/media/libstagefright/AVIExtractor.cpp +++ b/media/libstagefright/AVIExtractor.cpp @@ -1094,7 +1094,7 @@ status_t AVIExtractor::addH264CodecSpecificData(size_t trackIndex) { CHECK(meta->findData(kKeyAVCC, &type, &csd, &csdSize)); track->mMeta->setInt32(kKeyWidth, width); - track->mMeta->setInt32(kKeyHeight, width); + track->mMeta->setInt32(kKeyHeight, height); track->mMeta->setData(kKeyAVCC, type, csd, csdSize); return OK; |