diff options
| author | Ronghua Wu <ronghuawu@google.com> | 2015-01-23 13:47:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-23 13:47:10 +0000 |
| commit | d9e8b820116ee48237507da5ce0ffb29bc73350b (patch) | |
| tree | 3a7b9182664758975b38327c8b29b3cd732f45dd /media/libstagefright/codecs/m4v_h263 | |
| parent | 656d738cab67349f4b5a45473a0c48cf89c68fd0 (diff) | |
| parent | b3e1f71bbc154f35a5c0b113bb923ac9bf9d33dd (diff) | |
| download | frameworks_av-d9e8b820116ee48237507da5ce0ffb29bc73350b.zip frameworks_av-d9e8b820116ee48237507da5ce0ffb29bc73350b.tar.gz frameworks_av-d9e8b820116ee48237507da5ce0ffb29bc73350b.tar.bz2 | |
am b3e1f71b: am 841d22b0: libstagefright: Use aligned width and height.
* commit 'b3e1f71bbc154f35a5c0b113bb923ac9bf9d33dd':
libstagefright: Use aligned width and height.
Diffstat (limited to 'media/libstagefright/codecs/m4v_h263')
| -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; |