diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 16:11:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 16:11:01 +0200 |
| commit | 1abb875c980ab9ab12bc6fe0e0762f489d887968 (patch) | |
| tree | c02035ddf57a04ea9a260553e40eaa9c22f4706b | |
| parent | ee7da5baccc3e038179c4072e9bab00b5689c1a9 (diff) | |
| parent | daeb4e3042f2ecae2d41aaa4cae0bed932539788 (diff) | |
| download | ffmpeg-1abb875c980ab9ab12bc6fe0e0762f489d887968.tar.gz | |
Merge commit 'daeb4e3042f2ecae2d41aaa4cae0bed932539788'
* commit 'daeb4e3042f2ecae2d41aaa4cae0bed932539788':
jpeg2000: Proper cleanup on failure in decode_frame()
Conflicts:
libavcodec/jpeg2000.c
See: 9d56ccf5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/jpeg2000.c | 4 | ||||
| -rw-r--r-- | libavcodec/jpeg2000dec.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/jpeg2000.c b/libavcodec/jpeg2000.c index 85216f5f47..f044164ed6 100644 --- a/libavcodec/jpeg2000.c +++ b/libavcodec/jpeg2000.c @@ -501,7 +501,9 @@ void ff_jpeg2000_reinit(Jpeg2000Component *comp, Jpeg2000CodingStyle *codsty) void ff_jpeg2000_cleanup(Jpeg2000Component *comp, Jpeg2000CodingStyle *codsty) { int reslevelno, bandno, precno; - for (reslevelno = 0; comp->reslevel && reslevelno < codsty->nreslevels; reslevelno++) { + for (reslevelno = 0; + comp->reslevel && reslevelno < codsty->nreslevels; + reslevelno++) { Jpeg2000ResLevel *reslevel = comp->reslevel + reslevelno; for (bandno = 0; bandno < reslevel->nbands; bandno++) { diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 711b298d3f..7b8a9aa987 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -1412,8 +1412,6 @@ static int jpeg2000_decode_frame(AVCodecContext *avctx, void *data, } } else { bytestream2_seek(&s->g, 0, SEEK_SET); - if (bytestream2_peek_be16(&s->g) != JPEG2000_SOC) - bytestream2_skip(&s->g, 8); } if (bytestream2_get_be16u(&s->g) != JPEG2000_SOC) { |