diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2019-12-15 07:42:01 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-05-08 14:02:53 +0200 |
| commit | de20f6cb701bffc98062d825c339ce30a794ca01 (patch) | |
| tree | d230575b4f954e2f6381b99eece880c1f0688ccf /libavformat | |
| parent | ff4da60fb8d849f709295bcdcb67726ea189d62b (diff) | |
| download | ffmpeg-de20f6cb701bffc98062d825c339ce30a794ca01.tar.gz | |
avformat/hlsenc: Avoid setting unused variables
Several variables which are only used when the HLS_SINGLE_FILE flag is
unset have been set even when this flag is set. This has been changed.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/hlsenc.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 11b5c481b0..783bcffe57 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -2404,11 +2404,6 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) } } - if (oc->url[0]) { - proto = avio_find_protocol_name(oc->url); - use_temp_file = proto && !strcmp(proto, "file") && (hls->flags & HLS_TEMP_FILE); - } - if (hls->flags & HLS_SINGLE_FILE) { ret = flush_dynbuf(vs, &range_length); av_freep(&vs->temp_buffer); @@ -2417,6 +2412,12 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) } vs->size = range_length; } else { + if (oc->url[0]) { + proto = avio_find_protocol_name(oc->url); + use_temp_file = proto && !strcmp(proto, "file") + && (hls->flags & HLS_TEMP_FILE); + } + if ((hls->max_seg_size > 0 && (vs->size >= hls->max_seg_size)) || !byterange_mode) { AVDictionary *options = NULL; char *filename = NULL; @@ -2466,10 +2467,9 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) av_freep(&vs->temp_buffer); av_freep(&filename); } - } - if (use_temp_file && !(hls->flags & HLS_SINGLE_FILE)) { - hls_rename_temp_file(s, oc); + if (use_temp_file) + hls_rename_temp_file(s, oc); } old_filename = av_strdup(oc->url); |