Commit 7104c4dd authored by Andreas Rheinhardt's avatar Andreas Rheinhardt

avcodec/jpeg2000dec: Fix mixed declaration and code

Signed-off-by: 's avatarAndreas Rheinhardt <andreas.rheinhardt@gmail.com>
parent a39536ca
...@@ -862,6 +862,7 @@ static int get_plt(Jpeg2000DecoderContext *s, int n) ...@@ -862,6 +862,7 @@ static int get_plt(Jpeg2000DecoderContext *s, int n)
static int get_ppt(Jpeg2000DecoderContext *s, int n) static int get_ppt(Jpeg2000DecoderContext *s, int n)
{ {
Jpeg2000Tile *tile; Jpeg2000Tile *tile;
void *new;
if (n < 3) { if (n < 3) {
av_log(s->avctx, AV_LOG_ERROR, "Invalid length for PPT data.\n"); 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) ...@@ -879,8 +880,8 @@ static int get_ppt(Jpeg2000DecoderContext *s, int n)
tile->has_ppt = 1; // this tile has a ppt marker tile->has_ppt = 1; // this tile has a ppt marker
bytestream2_get_byte(&s->g); // Zppt is skipped and not used bytestream2_get_byte(&s->g); // Zppt is skipped and not used
void* new = av_realloc(tile->packed_headers, new = av_realloc(tile->packed_headers,
tile->packed_headers_size + n - 3); tile->packed_headers_size + n - 3);
if (new) { if (new) {
tile->packed_headers = new; tile->packed_headers = new;
} else } else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment