diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-03-29 14:37:21 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-03-29 14:37:21 +0000 |
commit | b4f5702c0a2643672e77491786a021b51b8d0aec (patch) | |
tree | 2b7c494314765afb76416dc3898032aeedff9059 /libvo/vo_kva.c | |
parent | c3cf2ce654f54c5dda2618ae9e26614d6fe4ab2a (diff) | |
download | mpv-b4f5702c0a2643672e77491786a021b51b8d0aec.tar.bz2 mpv-b4f5702c0a2643672e77491786a021b51b8d0aec.tar.xz |
Consistently use MP_MAX_PLANES as size for plane pointer/stride arrays in libvo.
This might avoid some issues since sws_scale in some cases assumes these
have at least 4 valid entries.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29101 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vo_kva.c')
-rw-r--r-- | libvo/vo_kva.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libvo/vo_kva.c b/libvo/vo_kva.c index 57df14b358..4805d51fbd 100644 --- a/libvo/vo_kva.c +++ b/libvo/vo_kva.c @@ -131,8 +131,8 @@ struct { PBYTE pbImage; BOOL fFixT23; PFNWP pfnwpOldFrame; - uint8_t *planes[3]; // y = 0, u = 1, v = 2 - int stride[3]; + uint8_t *planes[MP_MAX_PLANES]; // y = 0, u = 1, v = 2 + int stride[MP_MAX_PLANES]; BOOL fHWAccel; RECTL rclParent; struct SwsContext *sws; @@ -230,6 +230,8 @@ static void imgCreate(void) m_int.pbImage = malloc(size); + memset(m_int.planes, 0, sizeof(m_int.planes)); + memset(m_int.stride, 0, sizeof(m_int.stride)); m_int.planes[0] = m_int.pbImage; m_int.stride[0] = m_int.lStride; @@ -257,8 +259,8 @@ static void imgDisplay(void) ULONG ulBPL; if (!kvaLockBuffer(&pBuffer, &ulBPL)) { - uint8_t *dst[3]; - int dstStride[3]; + uint8_t *dst[MP_MAX_PLANES] = {NULL}; + int dstStride[MP_MAX_PLANES] = {0}; // Get packed or Y dst[0] = pBuffer; |