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