diff options
author | Ronghua Wu <ronghuawu@google.com> | 2015-01-23 19:55:43 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-23 19:55:43 +0000 |
commit | c079c5db8057d0ab602841f47fef1b40faaeccb3 (patch) | |
tree | aa00455152b08876ef1995fc2006281031c5bbf8 /media/libstagefright/codecs | |
parent | 7790a33241f773d8a99c6f27d3bde36da08d6238 (diff) | |
parent | d9e8b820116ee48237507da5ce0ffb29bc73350b (diff) | |
download | frameworks_av-c079c5db8057d0ab602841f47fef1b40faaeccb3.zip frameworks_av-c079c5db8057d0ab602841f47fef1b40faaeccb3.tar.gz frameworks_av-c079c5db8057d0ab602841f47fef1b40faaeccb3.tar.bz2 |
am d9e8b820: am b3e1f71b: am 841d22b0: libstagefright: Use aligned width and height.
* commit 'd9e8b820116ee48237507da5ce0ffb29bc73350b':
libstagefright: Use aligned width and height.
Diffstat (limited to 'media/libstagefright/codecs')
-rw-r--r-- | media/libstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/media/libstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp b/media/libstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp index b783222..90d7c6b 100644 --- a/media/libstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp +++ b/media/libstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp @@ -292,8 +292,10 @@ Bool PVAllocVideoData(VideoDecControls *decCtrl, int width, int height, int nLay if (video->shortVideoHeader == PV_TRUE) { - video->displayWidth = video->width = width; - video->displayHeight = video->height = height; + video->displayWidth = width; + video->displayHeight = height; + video->width = (width + 15) & -16; + video->height = (height + 15) & -16; video->nMBPerRow = video->nMBinGOB = video->width / MB_SIZE; |