highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hwcontext_vdpau: Fix missing subscripts

Browse Source 
Also remove the redundant casts which were hiding the error here.

Fixes Ubuntu bug 1688735, reported by andysem.

(cherry picked from commit 7081620aca)
This commit is contained in:
Mark Thompson
2016-09-13 20:45:55 +01:00
committed by Carl Eugen Hoyos
parent 582c3d514a
commit 016064625f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavutil/hwcontext_vdpau.c
View File

@@ -305,7 +305,7 @@ static int vdpau_transfer_data_from(AVHWFramesContext *ctx, AVFrame *dst,
for (i = 0; i< FF_ARRAY_ELEMS(data) && dst->data[i]; i++) { for (i = 0; i< FF_ARRAY_ELEMS(data) && dst->data[i]; i++) {
data[i] = dst->data[i]; data[i] = dst->data[i];
if (dst->linesize[i] < 0 || (uint64_t)dst->linesize > UINT32_MAX) { if (dst->linesize[i] < 0 || dst->linesize[i] > UINT32_MAX) {
av_log(ctx, AV_LOG_ERROR, av_log(ctx, AV_LOG_ERROR,
"The linesize %d cannot be represented as uint32\n", "The linesize %d cannot be represented as uint32\n",
dst->linesize[i]); dst->linesize[i]);
@@ -356,7 +356,7 @@ static int vdpau_transfer_data_to(AVHWFramesContext *ctx, AVFrame *dst,
for (i = 0; i< FF_ARRAY_ELEMS(data) && src->data[i]; i++) { for (i = 0; i< FF_ARRAY_ELEMS(data) && src->data[i]; i++) {
data[i] = src->data[i]; data[i] = src->data[i];
if (src->linesize[i] < 0 || (uint64_t)src->linesize > UINT32_MAX) { if (src->linesize[i] < 0 || src->linesize[i] > UINT32_MAX) {
av_log(ctx, AV_LOG_ERROR, av_log(ctx, AV_LOG_ERROR,
"The linesize %d cannot be represented as uint32\n", "The linesize %d cannot be represented as uint32\n",
src->linesize[i]); src->linesize[i]);