[FFmpeg-cvslog] hwcontext_vdpau: Fix missing subscripts

Mark Thompson git at videolan.org
Wed Jan 18 01:38:51 EET 2017


ffmpeg | branch: master | Mark Thompson <sw at jkqxz.net> | Tue Sep 13 20:45:55 2016 +0100| [f7e9275f83ec116fc859367d61998eae8af438fc] | committer: Mark Thompson

hwcontext_vdpau: Fix missing subscripts

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

(cherry picked from commit 7081620aca36e616ea96f71fd71d2703e3abae09)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f7e9275f83ec116fc859367d61998eae8af438fc
---

 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 49c44fe..cce5396 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]);



More information about the ffmpeg-cvslog mailing list