From f399b33c2bb7a25b0a60d50afc81d5e1967ca35a Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 22 May 2013 02:13:22 +0200 Subject: [PATCH] jpeg2000dec & j2kdec: Fix return type of get_sot() Signed-off-by: Michael Niedermayer --- libavcodec/j2kdec.c | 2 +- libavcodec/jpeg2000dec.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/j2kdec.c b/libavcodec/j2kdec.c index 893fcd0fef..22bbb2effd 100644 --- a/libavcodec/j2kdec.c +++ b/libavcodec/j2kdec.c @@ -435,7 +435,7 @@ static int get_qcc(Jpeg2000DecoderContext *s, int n, Jpeg2000QuantStyle *q, uint } /** get start of tile segment */ -static uint8_t get_sot(Jpeg2000DecoderContext *s) +static int get_sot(Jpeg2000DecoderContext *s) { if (bytestream2_get_bytes_left(&s->g) < 8) return AVERROR(EINVAL); diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 1778997cb4..4768f7eef0 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -406,7 +406,7 @@ static int get_qcc(Jpeg2000DecoderContext *s, int n, Jpeg2000QuantStyle *q, } /* Get start of tile segment. */ -static uint8_t get_sot(Jpeg2000DecoderContext *s, int n) +static int get_sot(Jpeg2000DecoderContext *s, int n) { Jpeg2000TilePart *tp; uint16_t Isot;