diff mbox series

[FFmpeg-devel,1/6] avformat/hlsenc: Don't reset AVIOContext pointer manually a second time

Message ID 20200509191509.9812-1-andreas.rheinhardt@gmail.com
State Accepted
Commit a90f2265fa54ab35ee1b2058c7d6e746fd847359
Headers show
Series [FFmpeg-devel,1/6] avformat/hlsenc: Don't reset AVIOContext pointer manually a second time
Related show

Checks

Context Check Description
andriy/default pending
andriy/make success Make finished
andriy/make_fate success Make fate finished

Commit Message

Andreas Rheinhardt May 9, 2020, 7:15 p.m. UTC
ff_format_io_close() already does it for us.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
---
 libavformat/hlsenc.c | 1 -
 1 file changed, 1 deletion(-)

Comments

Steven Liu May 10, 2020, 2:01 a.m. UTC | #1
> 2020年5月10日 上午3:15,Andreas Rheinhardt <andreas.rheinhardt@gmail.com> 写道:
> 
> ff_format_io_close() already does it for us.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
> ---
> libavformat/hlsenc.c | 1 -
> 1 file changed, 1 deletion(-)
> 
> diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
> index 7b289c060f..a796c124dd 100644
> --- a/libavformat/hlsenc.c
> +++ b/libavformat/hlsenc.c
> @@ -2497,7 +2497,6 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt)
>             if ((ret = hls_window(s, 0, vs)) < 0) {
>                 av_log(s, AV_LOG_WARNING, "upload playlist failed, will retry with a new http session.\n");
>                 ff_format_io_close(s, &vs->out);
> -                vs->out = NULL;
>                 if ((ret = hls_window(s, 0, vs)) < 0) {
>                     av_freep(&old_filename);
>                     return ret;
> -- 
> 2.20.1
> 
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> 
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

LGTM

Thanks

Steven Liu
diff mbox series

Patch

diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index 7b289c060f..a796c124dd 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -2497,7 +2497,6 @@  static int hls_write_packet(AVFormatContext *s, AVPacket *pkt)
             if ((ret = hls_window(s, 0, vs)) < 0) {
                 av_log(s, AV_LOG_WARNING, "upload playlist failed, will retry with a new http session.\n");
                 ff_format_io_close(s, &vs->out);
-                vs->out = NULL;
                 if ((ret = hls_window(s, 0, vs)) < 0) {
                     av_freep(&old_filename);
                     return ret;