ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-21 13:56:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

avcodec/dpx_parser: reset index when finding a startcode, not after

Browse Source 
This is simpler

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-05-29 17:08:53 +02:00
parent 25e6310a3e
commit f518fb3318
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/dpx_parser.c
View File

@ -57,6 +57,7 @@ static int dpx_parse(AVCodecParserContext *s, AVCodecContext *avctx,
state == MKTAG('S','D','P','X')) {
d->pc.frame_start_found = 1;
d->is_be = state == MKBETAG('S','D','P','X');
d->index = 0;
break;
}
}
@ -73,27 +74,26 @@ static int dpx_parse(AVCodecParserContext *s, AVCodecContext *avctx,
for (;d->pc.frame_start_found && i < buf_size; i++) {
d->pc.state = (d->pc.state << 8) | buf[i];
if (d->index == 16) {
d->index++;
if (d->index == 17) {
d->fsize = d->is_be ? d->pc.state : av_bswap32(d->pc.state);
if (d->fsize <= 1664) {
d->index = d->pc.frame_start_found = 0;
d->pc.frame_start_found = 0;
goto flush;
}
d->index = 0;
if (d->fsize > buf_size - i + 19)
d->remaining_size = d->fsize - buf_size + i - 19;
else
next = d->fsize + i - 19;
break;
}
d->index++;
}
flush:
if (ff_combine_frame(&d->pc, next, &buf, &buf_size) < 0)
return buf_size;
d->index = d->pc.frame_start_found = 0;
d->pc.frame_start_found = 0;
*poutbuf = buf;
*poutbuf_size = buf_size;