diff options
| author | Steven Liu <lq@chinaffmpeg.org> | 2017-03-14 10:16:00 +0800 |
|---|---|---|
| committer | Steven Liu <lq@chinaffmpeg.org> | 2017-03-14 10:16:00 +0800 |
| commit | d3ce067e7687203cf4a0a475ffd4b733b7c3b4f4 (patch) | |
| tree | ad614e91865c2df13436b6b9588036e95cd7b4aa /libavformat/hlsenc.c | |
| parent | 7cebc5a9ccba0de7bddf7900ae85652ebc66141c (diff) | |
| download | ffmpeg-d3ce067e7687203cf4a0a475ffd4b733b7c3b4f4.tar.gz | |
avformat/hlsenc: fix ticket 6231
check if the hls_flags is byterange_mode and check if should close fd
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
Diffstat (limited to 'libavformat/hlsenc.c')
| -rw-r--r-- | libavformat/hlsenc.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 5df25146a7..e2c021b754 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1362,6 +1362,7 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) end_pts, AV_TIME_BASE_Q) >= 0) { int64_t new_start_pos; char *old_filename = av_strdup(hls->avf->filename); + int byterange_mode = (hls->flags & HLS_SINGLE_FILE) || (hls->max_seg_size > 0); if (!old_filename) { return AVERROR(ENOMEM); @@ -1372,9 +1373,11 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) new_start_pos = avio_tell(hls->avf->pb); hls->size = new_start_pos - hls->start_pos; - ff_format_io_close(s, &oc->pb); - if (hls->vtt_avf) { - ff_format_io_close(s, &hls->vtt_avf->pb); + if (!byterange_mode) { + ff_format_io_close(s, &oc->pb); + if (hls->vtt_avf) { + ff_format_io_close(s, &hls->vtt_avf->pb); + } } if ((hls->flags & HLS_TEMP_FILE) && oc->filename[0]) { if (!(hls->flags & HLS_SINGLE_FILE) || (hls->max_seg_size <= 0)) |