RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-07 15:22:57 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/flac_parser: ensure there are more headers for scoring

Browse Source 
Previously invalid frame may be returned, happened when seeking.

Fixes #7684
This commit is contained in:
Paul B Mahol 2022-09-05 18:12:10 +02:00
parent e4c1272711
commit 5ca781598e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/flac_parser.c
View File

@ -600,7 +600,7 @@ static int score_header(FLACParseContext *fpc, FLACHeaderMarker *header)
static void score_sequences(FLACParseContext *fpc) static void score_sequences(FLACParseContext *fpc)
{ {
FLACHeaderMarker *curr; FLACHeaderMarker *curr;
int best_score = 0;//FLAC_HEADER_NOT_SCORED_YET; int best_score = FLAC_HEADER_NOT_SCORED_YET;
/* First pass to clear all old scores. */ /* First pass to clear all old scores. */
for (curr = fpc->headers; curr; curr = curr->next) for (curr = fpc->headers; curr; curr = curr->next)
curr->max_score = FLAC_HEADER_NOT_SCORED_YET; curr->max_score = FLAC_HEADER_NOT_SCORED_YET;
@ -682,7 +682,7 @@ static int flac_parse(AVCodecParserContext *s, AVCodecContext *avctx,
} }
fpc->avctx = avctx; fpc->avctx = avctx;
if (fpc->best_header_valid) if (fpc->best_header_valid && fpc->nb_headers_buffered >= FLAC_MIN_HEADERS)
return get_best_header(fpc, poutbuf, poutbuf_size); return get_best_header(fpc, poutbuf, poutbuf_size);
/* If a best_header was found last call remove it with the buffer data. */ /* If a best_header was found last call remove it with the buffer data. */