diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-03-18 04:59:54 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-03-20 04:23:05 +0100 |
| commit | 258a88dfe48e0eea1dd62ff196db36180d02a16e (patch) | |
| tree | a7ae8341260ab3dc1277e7b7de1670840ec95d75 | |
| parent | 9faf3f8bb04e537f552332aa316c6659dcd7d251 (diff) | |
| download | ffmpeg-258a88dfe48e0eea1dd62ff196db36180d02a16e.tar.gz | |
avformat/utils: Always leave parse_pkt in blank state, avoid resetting
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>
| -rw-r--r-- | libavformat/utils.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 295e676c9c..ee947c195d 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -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; } |