ffmpeg | branch: master | Zhao Zhili <zhiliz...@tencent.com> | Tue Feb 11 21:21:48 2025 +0800| [88d9ecaa7b792edc9baf22d0f4eca2071cafd91e] | committer: Zhao Zhili
avutil/frame: Fix direct pointer compare between different array Signed-off-by: Zhao Zhili <zhiliz...@tencent.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=88d9ecaa7b792edc9baf22d0f4eca2071cafd91e --- libavutil/frame.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libavutil/frame.c b/libavutil/frame.c index 992115e04f..492b467ebd 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -730,7 +730,7 @@ int av_frame_copy_props(AVFrame *dst, const AVFrame *src) AVBufferRef *av_frame_get_plane_buffer(const AVFrame *frame, int plane) { - uint8_t *data; + uintptr_t data; int planes; if (frame->nb_samples) { @@ -743,16 +743,20 @@ AVBufferRef *av_frame_get_plane_buffer(const AVFrame *frame, int plane) if (plane < 0 || plane >= planes || !frame->extended_data[plane]) return NULL; - data = frame->extended_data[plane]; + data = (uintptr_t)frame->extended_data[plane]; for (int i = 0; i < FF_ARRAY_ELEMS(frame->buf) && frame->buf[i]; i++) { AVBufferRef *buf = frame->buf[i]; - if (data >= buf->data && data < buf->data + buf->size) + uintptr_t buf_begin = (uintptr_t)buf->data; + + if (data >= buf_begin && data < buf_begin + buf->size) return buf; } for (int i = 0; i < frame->nb_extended_buf; i++) { AVBufferRef *buf = frame->extended_buf[i]; - if (data >= buf->data && data < buf->data + buf->size) + uintptr_t buf_begin = (uintptr_t)buf->data; + + if (data >= buf_begin && data < buf_begin + buf->size) return buf; } return NULL; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
