virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-28 12:32:17 +02:00
Code Issues Releases Activity

avcodec/jpeg2000dec: Fix mixed declaration and code

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-04-09 14:37:37 +02:00
parent a39536caee
commit 7104c4dd88
1 changed files with 3 additions and 2 deletions

5
libavcodec/jpeg2000dec.c

@ -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)
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