summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs
diff options
context:
space:
mode:
authorAbhishek Arya <aarya@google.com>2015-08-25 05:23:24 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-25 05:23:24 +0000
commitf9a51893d739000cd70caf10c83d0e603371f5b1 (patch)
tree59bfac3aa52dc9bf83a30b92611e50920d682786 /media/libstagefright/codecs
parent3a7ff4c754fcb99c29621ed94b08ed6fb65f6495 (diff)
parent9a2be5d49d57b239bf6345f033eab01ba98f3889 (diff)
downloadframeworks_av-f9a51893d739000cd70caf10c83d0e603371f5b1.zip
frameworks_av-f9a51893d739000cd70caf10c83d0e603371f5b1.tar.gz
frameworks_av-f9a51893d739000cd70caf10c83d0e603371f5b1.tar.bz2
am 9a2be5d4: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into klp-dev
* commit '9a2be5d49d57b239bf6345f033eab01ba98f3889': DO NOT MERGE - Fix software video decoder buffer size calculation
Diffstat (limited to 'media/libstagefright/codecs')
-rw-r--r--media/libstagefright/codecs/on2/dec/SoftVPX.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/on2/dec/SoftVPX.cpp b/media/libstagefright/codecs/on2/dec/SoftVPX.cpp
index 476e986..2bae2ad 100644
--- a/media/libstagefright/codecs/on2/dec/SoftVPX.cpp
+++ b/media/libstagefright/codecs/on2/dec/SoftVPX.cpp
@@ -151,7 +151,7 @@ void SoftVPX::onQueueFilled(OMX_U32 portIndex) {
}
outHeader->nOffset = 0;
- outHeader->nFilledLen = (width * height * 3) / 2;
+ outHeader->nFilledLen = (mWidth * mHeight * 3) / 2;
outHeader->nFlags = EOSseen ? OMX_BUFFERFLAG_EOS : 0;
outHeader->nTimeStamp = inHeader->nTimeStamp;