diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-22 02:13:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-22 02:14:04 +0200 |
| commit | f399b33c2bb7a25b0a60d50afc81d5e1967ca35a (patch) | |
| tree | 339a2ba036a9d4380f78492857511e2642e3f415 | |
| parent | 4a9a6a1f358c25c295e87177f9439c11b383690f (diff) | |
| download | ffmpeg-f399b33c2bb7a25b0a60d50afc81d5e1967ca35a.tar.gz | |
jpeg2000dec & j2kdec: Fix return type of get_sot()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/j2kdec.c | 2 | ||||
| -rw-r--r-- | 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; |