commit 25da2f099f657d8b778ce3c03f5d4519e04150cf
author Lajos Molnar <lajos@google.com> Mon Feb 10 17:39:01 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Feb 10 17:39:01 2014 +0000
tree 0f5e4c0a1ae846531105965649c1067fedc762e3
parent 15f08b1e75ab01d55e4cbab1f8d3570f354651f6
parent 88e99f9a5e098ee50019ce85f2b1273b48883f37

am 88e99f9a: Merge "SoftVPXEncoder: Set the frame size on the output port as well"

* commit '88e99f9a5e098ee50019ce85f2b1273b48883f37':
  SoftVPXEncoder: Set the frame size on the output port as well

media/libstagefright/codecs/on2/enc/SoftVPXEncoder.cpp

diff --git a/media/libstagefright/codecs/on2/enc/SoftVPXEncoder.cpp b/media/libstagefright/codecs/on2/enc/SoftVPXEncoder.cpp
index 8375cac..5efe022 100644
--- a/media/libstagefright/codecs/on2/enc/SoftVPXEncoder.cpp
+++ b/media/libstagefright/codecs/on2/enc/SoftVPXEncoder.cpp
@@ -677,6 +677,9 @@
         def->format.video.nFrameHeight = mHeight;
         def->format.video.xFramerate = port->format.video.xFramerate;
         def->format.video.eColorFormat = mColorFormat;
+        def = &editPortInfo(kOutputPortIndex)->mDef;
+        def->format.video.nFrameWidth = mWidth;
+        def->format.video.nFrameHeight = mHeight;
 
         return OMX_ErrorNone;
     } else if (port->nPortIndex == kOutputPortIndex) {