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 | 17078d8a83becd5bfb49a39f1415882b78d07a49 (patch) | |
tree | e755c472a80ff39ffac15d74460855e9f5dc725e | |
parent | 2c0dd961d42ad75529a557240ed570f97b237d2f (diff) | |
parent | 1d26d11ebdc2cd53691b868e7dde844a708896a1 (diff) | |
download | frameworks_av-17078d8a83becd5bfb49a39f1415882b78d07a49.zip frameworks_av-17078d8a83becd5bfb49a39f1415882b78d07a49.tar.gz frameworks_av-17078d8a83becd5bfb49a39f1415882b78d07a49.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
-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; |