ffmpeg | branch: release/3.2 | Mark Thompson <s...@jkqxz.net> | Tue Sep 13 20:45:55 2016 +0100| [016064625fd5fb6ba31a797cfd7d9c7f0419ca8c] | committer: Carl Eugen Hoyos
hwcontext_vdpau: Fix missing subscripts Also remove the redundant casts which were hiding the error here. Fixes Ubuntu bug 1688735, reported by andysem. (cherry picked from commit 7081620aca36e616ea96f71fd71d2703e3abae09) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=016064625fd5fb6ba31a797cfd7d9c7f0419ca8c --- libavutil/hwcontext_vdpau.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavutil/hwcontext_vdpau.c b/libavutil/hwcontext_vdpau.c index 49c44fed0d..cce5396043 100644 --- a/libavutil/hwcontext_vdpau.c +++ b/libavutil/hwcontext_vdpau.c @@ -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++) { 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, "The linesize %d cannot be represented as uint32\n", 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++) { 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, "The linesize %d cannot be represented as uint32\n", src->linesize[i]); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
