commit 1d26d11ebdc2cd53691b868e7dde844a708896a1
author Andreas Huber <andih@google.com> Thu Dec 01 10:20:09 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Dec 01 10:20:09 2011 -0800
tree fba9ea601042188ab396e20cb69e98ffe6ff6290
parent 15031854d15ffcc5c955290f61aa59aa09e1fde9
parent 4fe1c6c3988f79fd67c14a1f91e4b1df8a7e806f

am 2c2ed7be: Merge "Fixes a typo in AVIExtractor that would advertise the wrong video dimensions" into ics-mr1

* commit '2c2ed7bef931f43dc0701ab723beb0cbed2cb630':
  Fixes a typo in AVIExtractor that would advertise the wrong video dimensions

media/libstagefright/AVIExtractor.cpp

diff --git a/media/libstagefright/AVIExtractor.cpp b/media/libstagefright/AVIExtractor.cpp
index 0be2ca4..815f987 100644
--- a/media/libstagefright/AVIExtractor.cpp
+++ b/media/libstagefright/AVIExtractor.cpp
@@ -1094,7 +1094,7 @@
     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;