From: "Léon Spaans" <leons@gridpoint.nl>
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH] libavformat/hlsenc: set HTTP options before writing WebVTT HLS playlists
Date: Fri, 6 Oct 2023 23:40:59 +0200
Message-ID: <ACE3EAD5-700A-4271-9AB9-2037C04F05B7@gridpoint.nl> (raw)
Fixes: Erroneous HTTP POST instead of HTTP PUT for WebVTT HLS variant playlists.
Signed-off-by: Léon Spaans <leons@gridpoint.nl>
---
libavformat/hlsenc.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index 08f3746ce7..8f7eee202e 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -1580,7 +1580,9 @@ static int hls_window(AVFormatContext *s, int last, VariantStream *vs)
set_http_options(s, &options, hls);
snprintf(temp_filename, sizeof(temp_filename), use_temp_file ? "%s.tmp" : "%s", vs->m3u8_name);
- if ((ret = hlsenc_io_open(s, byterange_mode ? &hls->m3u8_out : &vs->out, temp_filename, &options)) < 0) {
+ ret = hlsenc_io_open(s, byterange_mode ? &hls->m3u8_out : &vs->out, temp_filename, &options);
+ av_dict_free(&options);
+ if (ret < 0) {
if (hls->ignore_io_errors)
ret = 0;
goto fail;
@@ -1635,8 +1637,11 @@ static int hls_window(AVFormatContext *s, int last, VariantStream *vs)
ff_hls_write_end_list(byterange_mode ? hls->m3u8_out : vs->out);
if (vs->vtt_m3u8_name) {
+ set_http_options(vs->vtt_avf, &options, hls);
snprintf(temp_vtt_filename, sizeof(temp_vtt_filename), use_temp_file ? "%s.tmp" : "%s", vs->vtt_m3u8_name);
- if ((ret = hlsenc_io_open(s, &hls->sub_m3u8_out, temp_vtt_filename, &options)) < 0) {
+ ret = hlsenc_io_open(s, &hls->sub_m3u8_out, temp_vtt_filename, &options);
+ av_dict_free(&options);
+ if (ret < 0) {
if (hls->ignore_io_errors)
ret = 0;
goto fail;
--
2.40.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".
next reply other threads:[~2023-10-06 21:41 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-06 21:40 Léon Spaans [this message]
2023-10-11 1:50 ` Steven Liu
-- strict thread matches above, loose matches on Subject: below --
2023-10-01 14:40 Léon Spaans
2023-10-01 23:16 ` Steven Liu
2023-10-02 3:50 ` Léon Spaans
2023-10-05 7:15 ` Léon Spaans
2023-10-05 7:25 ` Steven Liu
2023-10-06 14:50 ` Steven Liu
2023-10-06 21:09 ` Léon Spaans
2023-10-01 9:38 Léon Spaans
2023-10-01 12:43 ` Steven Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ACE3EAD5-700A-4271-9AB9-2037C04F05B7@gridpoint.nl \
--to=leons@gridpoint.nl \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git