v4l2_m2m: Fix integer overflow in timestamp handling

2e96f527 · Mark Thompson · Jorge Ramirez-Ortiz · 388a0f78 · 2e96f527
Commit 2e96f527 authored Jan 21, 2018 by Mark Thompson Committed by Jorge Ramirez-Ortiz Jan 22, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

v4l2_buffers.c libavcodec/v4l2_buffers.c +2 -1

No files found.
--- a/libavcodec/v4l2_buffers.c
+++ b/libavcodec/v4l2_buffers.c
@@ -69,7 +69,8 @@ static inline uint64_t v4l2_get_pts(V4L2Buffer *avbuf)
    int64_t v4l2_pts;

    /* convert pts back to encoder timebase */
-    v4l2_pts = avbuf->buf.timestamp.tv_sec * USEC_PER_SEC + avbuf->buf.timestamp.tv_usec;
+    v4l2_pts = (int64_t)avbuf->buf.timestamp.tv_sec * USEC_PER_SEC +
+                        avbuf->buf.timestamp.tv_usec;

    return av_rescale_q(v4l2_pts, v4l2_timebase, s->avctx->time_base);
 }