commit f663514d09c7ee6a4655cd7d67f12254519a1d2a
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jan 11 21:34:03 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 11 21:34:03 2017 +0000
tree c910f6fb116fa0014a6b861a6f7d6ffdadb39b75
parent d7c5ec857930496bb8a1045dc8b87b2fdd99899c
parent 77a650d3407d4d2ffd698b32c8ee1d24374d080e

Merge "media: Fix the camera recording error."

media/libstagefright/MPEG4Writer.cpp

diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp
index ac15687..716f5d8 100755
--- a/media/libstagefright/MPEG4Writer.cpp
+++ b/media/libstagefright/MPEG4Writer.cpp
@@ -3260,8 +3260,8 @@
         mOwner->writeInt32(0);
     } else {
         int32_t width, height;
-        bool success = mMeta->findInt32(kKeyDisplayWidth, &width);
-        success = success && mMeta->findInt32(kKeyDisplayHeight, &height);
+        bool success = mMeta->findInt32(kKeyWidth, &width);
+        success = success && mMeta->findInt32(kKeyHeight, &height);
         CHECK(success);
 
         mOwner->writeInt32(width << 16);   // 32-bit fixed-point value