highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/utils: Always leave parse_pkt in blank state, avoid resetting

Browse Source 
Always leaving said packet in a blank state after having used it
allows to avoid having to reset it before one uses it; and it also
allows to use it in more places than just in parse_packet() here.

Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2021-03-18 04:59:54 +01:00
parent 9faf3f8bb0
commit 258a88dfe4
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/utils.c
View File

@ -1427,9 +1427,7 @@ static int parse_packet(AVFormatContext *s, AVPacket *pkt,
int size = pkt->size;
int ret = 0, got_output = flush;
if (size || flush) {
av_packet_unref(out_pkt);
} else if (st->parser->flags & PARSER_FLAG_COMPLETE_FRAMES) {
if (!size && !flush && st->parser->flags & PARSER_FLAG_COMPLETE_FRAMES) {
// preserve 0-size sync packets
compute_pkt_fields(s, st, st->parser, pkt, AV_NOPTS_VALUE, AV_NOPTS_VALUE);
}
@ -1512,10 +1510,8 @@ static int parse_packet(AVFormatContext *s, AVPacket *pkt,
ret = avpriv_packet_list_put(&s->internal->parse_queue,
&s->internal->parse_queue_end,
out_pkt, NULL, 0);
if (ret < 0) {
av_packet_unref(out_pkt);
if (ret < 0)
goto fail;
}
}
/* end of the stream => close and free the parser */
@ -1525,6 +1521,8 @@ static int parse_packet(AVFormatContext *s, AVPacket *pkt,
}
fail:
if (ret < 0)
av_packet_unref(out_pkt);
av_packet_unref(pkt);
return ret;
}