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

lavf/hls: remove redundancy reset_packet() after av_packet_unref()

Browse Source 
av_packet_unref have reseted the AVPacket, so don't need to call
reset_packet after that.

Reviewed-by: Steven Liu <lq@chinaffmpeg.org>
Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
This commit is contained in:
Jun Zhao 2019-07-15 12:24:14 +08:00
parent cc6a1f1417
commit 606be4cb50
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/hls.c
View File

@ -2120,7 +2120,6 @@ static int hls_read_packet(AVFormatContext *s, AVPacket *pkt)
} }
} }
av_packet_unref(&pls->pkt); av_packet_unref(&pls->pkt);
reset_packet(&pls->pkt);
} }
} }
/* Check if this stream has the packet with the lowest dts */ /* Check if this stream has the packet with the lowest dts */
@ -2149,7 +2148,6 @@ static int hls_read_packet(AVFormatContext *s, AVPacket *pkt)
ret = update_streams_from_subdemuxer(s, pls); ret = update_streams_from_subdemuxer(s, pls);
if (ret < 0) { if (ret < 0) {
av_packet_unref(&pls->pkt); av_packet_unref(&pls->pkt);
reset_packet(&pls->pkt);
return ret; return ret;
} }
@ -2174,7 +2172,6 @@ static int hls_read_packet(AVFormatContext *s, AVPacket *pkt)
av_log(s, AV_LOG_ERROR, "stream index inconsistency: index %d, %d main streams, %d subdemuxer streams\n", av_log(s, AV_LOG_ERROR, "stream index inconsistency: index %d, %d main streams, %d subdemuxer streams\n",
pls->pkt.stream_index, pls->n_main_streams, pls->ctx->nb_streams); pls->pkt.stream_index, pls->n_main_streams, pls->ctx->nb_streams);
av_packet_unref(&pls->pkt); av_packet_unref(&pls->pkt);
reset_packet(&pls->pkt);
return AVERROR_BUG; return AVERROR_BUG;
} }
@ -2262,7 +2259,6 @@ static int hls_read_seek(AVFormatContext *s, int stream_index,
ff_format_io_close(pls->parent, &pls->input_next); ff_format_io_close(pls->parent, &pls->input_next);
pls->input_next_requested = 0; pls->input_next_requested = 0;
av_packet_unref(&pls->pkt); av_packet_unref(&pls->pkt);
reset_packet(&pls->pkt);
pls->pb.eof_reached = 0; pls->pb.eof_reached = 0;
/* Clear any buffered data */ /* Clear any buffered data */
pls->pb.buf_end = pls->pb.buf_ptr = pls->pb.buffer; pls->pb.buf_end = pls->pb.buf_ptr = pls->pb.buffer;