diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-01-07 14:55:40 +0100 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2020-02-10 22:41:38 +0100 |
| commit | 6a67d518d60b61ae2bd98c3948894a7be9955e8c (patch) | |
| tree | 25f165390e6e0e72537007ee31edc7a03a02b789 /libavformat/concatdec.c | |
| parent | bbea268aa806a740e25c7dededf8dbe946e78bc5 (diff) | |
| download | ffmpeg-6a67d518d60b61ae2bd98c3948894a7be9955e8c.tar.gz | |
avformat: Remove unnecessary av_packet_unref()
Since bae8844e the packet will always be unreferenced when a demuxer
returns an error, so that a lot of calls to av_packet_unref() in lots of
demuxers are now redundant and can be removed.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'libavformat/concatdec.c')
| -rw-r--r-- | libavformat/concatdec.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c index e826821241..2173911ce4 100644 --- a/libavformat/concatdec.c +++ b/libavformat/concatdec.c @@ -542,7 +542,6 @@ static int filter_packet(AVFormatContext *avf, ConcatStream *cs, AVPacket *pkt) if (ret < 0) { av_log(avf, AV_LOG_ERROR, "h264_mp4toannexb filter " "failed to send input packet\n"); - av_packet_unref(pkt); return ret; } @@ -592,7 +591,6 @@ static int concat_read_packet(AVFormatContext *avf, AVPacket *pkt) if (ret < 0) return ret; if ((ret = match_streams(avf)) < 0) { - av_packet_unref(pkt); return ret; } if (packet_after_outpoint(cat, pkt)) { @@ -608,7 +606,7 @@ static int concat_read_packet(AVFormatContext *avf, AVPacket *pkt) } break; } - if ((ret = filter_packet(avf, cs, pkt))) + if ((ret = filter_packet(avf, cs, pkt)) < 0) return ret; st = cat->avf->streams[pkt->stream_index]; |