diff options
| author | Marton Balint <cus@passwd.hu> | 2024-03-31 20:50:31 +0200 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2024-04-09 23:13:09 +0200 |
| commit | 7801451376d6acda08f6ee2b1cefd02a9fcf0857 (patch) | |
| tree | 23449a32dce1cad1416b323eb3e4d3bca0e17c76 | |
| parent | 4721b9f15fc8487d718cce918f51db5b7734a942 (diff) | |
| download | ffmpeg-7801451376d6acda08f6ee2b1cefd02a9fcf0857.tar.gz | |
avformat/hlsenc: use a slash separator even in win32
We don't know if the protocol used is referring to a local file or a remote
resource, so it is better to simply use slash as separator which works all the
time. (well, except in very special cases when the user specified a \\?\ path)
Fixes ticket #9780.
Signed-off-by: Marton Balint <cus@passwd.hu>
| -rw-r--r-- | libavformat/hlsenc.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index ac8bb189f0..bde7230036 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -570,12 +570,6 @@ static void reflush_dynbuf(VariantStream *vs, int *range_length) avio_write(vs->out, vs->temp_buffer, *range_length); } -#if HAVE_DOS_PATHS -#define SEPARATOR '\\' -#else -#define SEPARATOR '/' -#endif - static int hls_delete_file(HLSContext *hls, AVFormatContext *avf, char *path, const char *proto) { @@ -668,7 +662,7 @@ static int hls_delete_old_segments(AVFormatContext *s, HLSContext *hls, av_log(hls, AV_LOG_DEBUG, "deleting old segment %s\n", segment->filename); if (!hls->use_localtime_mkdir) // segment->filename contains basename only - av_bprintf(&path, "%s%c", dirname, SEPARATOR); + av_bprintf(&path, "%s/", dirname); av_bprintf(&path, "%s", segment->filename); if (!av_bprint_is_complete(&path)) { @@ -685,8 +679,7 @@ static int hls_delete_old_segments(AVFormatContext *s, HLSContext *hls, vtt_dirname = av_dirname(vtt_dirname_r); av_bprint_clear(&path); - av_bprintf(&path, "%s%c%s", vtt_dirname, SEPARATOR, - segment->sub_filename); + av_bprintf(&path, "%s/%s", vtt_dirname, segment->sub_filename); av_freep(&vtt_dirname_r); if (!av_bprint_is_complete(&path)) { |