diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-04-09 14:37:37 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-04-09 18:19:04 +0200 |
| commit | 7104c4dd88078266492b756b3422e4e516bde878 (patch) | |
| tree | ee6a247ee3041bd8576986fa54919c0329b0b6ea /libavcodec/jpeg2000dec.c | |
| parent | a39536caee6607f481e9075bfb11937f46a47489 (diff) | |
| download | ffmpeg-7104c4dd88078266492b756b3422e4e516bde878.tar.gz | |
avcodec/jpeg2000dec: Fix mixed declaration and code
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Diffstat (limited to 'libavcodec/jpeg2000dec.c')
| -rw-r--r-- | libavcodec/jpeg2000dec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 846e31d0a2..9684e57b34 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -862,6 +862,7 @@ static int get_plt(Jpeg2000DecoderContext *s, int n) static int get_ppt(Jpeg2000DecoderContext *s, int n) { Jpeg2000Tile *tile; + void *new; if (n < 3) { av_log(s->avctx, AV_LOG_ERROR, "Invalid length for PPT data.\n"); @@ -879,8 +880,8 @@ static int get_ppt(Jpeg2000DecoderContext *s, int n) tile->has_ppt = 1; // this tile has a ppt marker bytestream2_get_byte(&s->g); // Zppt is skipped and not used - void* new = av_realloc(tile->packed_headers, - tile->packed_headers_size + n - 3); + new = av_realloc(tile->packed_headers, + tile->packed_headers_size + n - 3); if (new) { tile->packed_headers = new; } else |