Merge pull request xbmc#18945 from fritsch/mtrix

DVDFileInfo: Consult av_image_get_buffer_size before allocating
johnrvt · Dec 21, 2020 · 9aafe58 · 9aafe58
2 parents 39d0d50 + 78d2eb9
commit 9aafe58
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/xbmc/cores/VideoPlayer/DVDFileInfo.cpp b/xbmc/cores/VideoPlayer/DVDFileInfo.cpp
@@ -250,7 +250,9 @@ bool CDVDFileInfo::ExtractThumb(const CFileItem& fileItem,
  aspect = hint.aspect;
  unsigned int nHeight = (unsigned int)((double)nWidth / aspect);
 
- uint8_t *pOutBuf = (uint8_t*)av_malloc(nWidth * nHeight * 4);
+ // We pass the buffers to sws_scale uses 16 aligned widths when using intrinsics
+ int sizeNeeded = FFALIGN(nWidth, 16) * nHeight * 4;
+ uint8_t *pOutBuf = static_cast<uint8_t*>(av_malloc(sizeNeeded));
  struct SwsContext *context = sws_getContext(picture.iWidth, picture.iHeight,
  AV_PIX_FMT_YUV420P, nWidth, nHeight, AV_PIX_FMT_BGRA, SWS_FAST_BILINEAR, NULL, NULL, NULL);