apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-10-27 02:41:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

avcodec/jpeg2000dec: move "missing SIZ" check up

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-09-18 10:04:43 +02:00
parent 8ae14bf5ce
commit 2dd38a1d48
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/jpeg2000dec.c
View File

@@ -1390,14 +1390,14 @@ static int jpeg2000_read_main_headers(Jpeg2000DecoderContext *s)
Jpeg2000Tile *tile; Jpeg2000Tile *tile;
Jpeg2000TilePart *tp; Jpeg2000TilePart *tp;
if (s->curtileno < 0) {
av_log(s->avctx, AV_LOG_ERROR, "Missing SOT\n");
return AVERROR_INVALIDDATA;
}
if (!s->tile) { if (!s->tile) {
av_log(s->avctx, AV_LOG_ERROR, "Missing SIZ\n"); av_log(s->avctx, AV_LOG_ERROR, "Missing SIZ\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if (s->curtileno < 0) {
av_log(s->avctx, AV_LOG_ERROR, "Missing SOT\n");
return AVERROR_INVALIDDATA;
}
tile = s->tile + s->curtileno; tile = s->tile + s->curtileno;
tp = tile->tile_part + tile->tp_idx; tp = tile->tile_part + tile->tp_idx;