generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/dpx_parser: Allow frame size to be too small

Browse Source 
Fixes Ticket3402

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-05-29 17:26:26 +02:00
parent 8df5d9aabf
commit fba0ac2805
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/dpx_parser.c
View File

@@ -68,7 +68,6 @@ static int dpx_parse(AVCodecParserContext *s, AVCodecContext *avctx,
d->remaining_size -= i; d->remaining_size -= i;
if (d->remaining_size) if (d->remaining_size)
goto flush; goto flush;
next = i;
} }
} }
@@ -84,8 +83,15 @@ static int dpx_parse(AVCodecParserContext *s, AVCodecContext *avctx,
if (d->fsize > buf_size - i + 19) if (d->fsize > buf_size - i + 19)
d->remaining_size = d->fsize - buf_size + i - 19; d->remaining_size = d->fsize - buf_size + i - 19;
else else
next = d->fsize + i - 19; i += d->fsize - 19;
break; break;
} else if (d->index > 17) {
if (d->pc.state == MKBETAG('S','D','P','X') ||
d->pc.state == MKTAG('S','D','P','X')) {
next = i - 4;
break;
}
} }
} }