The arguments of av_reduce are signed, so the cast to uint64_t is misleading.
Signed-off-by: Andreas Cadhalpun <andreas.cadhal...@googlemail.com>
---
libavcodec/tiff.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index 4721e94..12ef419 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -772,9 +772,16 @@ static void set_sar(TiffContext *s, unsigned tag, unsigned
num, unsigned den)
int offset = tag == TIFF_YRES ? 2 : 0;
s->res[offset++] = num;
s->res[offset] = den;
- if (s->res[0] && s->res[1] && s->res[2] && s->res[3])
+ if (s->res[0] && s->res[1] && s->res[2] && s->res[3]) {
+ uint64_t num = s->res[2] * (uint64_t)s->res[1];
+ uint64_t den = s->res[0] * (uint64_t)s->res[3];
+ if (num > INT64_MAX || den > INT64_MAX) {
+ num = num >> 1;
+ den = den >> 1;
+ }
av_reduce(&s->avctx->sample_aspect_ratio.num,
&s->avctx->sample_aspect_ratio.den,
- s->res[2] * (uint64_t)s->res[1], s->res[0] *
(uint64_t)s->res[3], INT32_MAX);
+ num, den, INT32_MAX);
+ }
}
static int tiff_decode_tag(TiffContext *s, AVFrame *frame)
--
2.10.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
