Re: [FFmpeg-devel] [PATCH v2] avformat/http: copy only mime type from Content-Type
On 6/28/23 20:12, Leo Izen wrote: On 6/16/23 13:46, Kacper Michajlow wrote: On Thu, 1 Jun 2023 at 21:44, Kacper Michajłow wrote: Content-Type can include charset and boundary which is not a part of mime type and shouldn't be copied as such. Fixes HLS playback when the Content-Type includes additional fields. Signed-off-by: Kacper Michajłow --- libavformat/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/http.c b/libavformat/http.c index 0817aafb5b..fd931c2d8e 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -1205,7 +1205,7 @@ static int process_line(URLContext *h, char *line, int line_count) } } else if (!av_strcasecmp(tag, "Content-Type")) { av_free(s->mime_type); - s->mime_type = av_strdup(p); + s->mime_type = av_get_token((const char **), ";"); } else if (!av_strcasecmp(tag, "Set-Cookie")) { if (parse_cookie(s, p, >cookie_dict)) av_log(h, AV_LOG_WARNING, "Unable to parse '%s'\n", p); -- 2.34.1 Bump. I would prefer this smal thing to be fixed upstream, than adding workaround. Thanks. LGTM, will push tomorrow if no objections. - Leo Izen Pushed as 0cd2e7dcfbc8. - Leo Izen ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH v2] avformat/http: copy only mime type from Content-Type
On 6/16/23 13:46, Kacper Michajlow wrote: On Thu, 1 Jun 2023 at 21:44, Kacper Michajłow wrote: Content-Type can include charset and boundary which is not a part of mime type and shouldn't be copied as such. Fixes HLS playback when the Content-Type includes additional fields. Signed-off-by: Kacper Michajłow --- libavformat/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/http.c b/libavformat/http.c index 0817aafb5b..fd931c2d8e 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -1205,7 +1205,7 @@ static int process_line(URLContext *h, char *line, int line_count) } } else if (!av_strcasecmp(tag, "Content-Type")) { av_free(s->mime_type); -s->mime_type = av_strdup(p); +s->mime_type = av_get_token((const char **), ";"); } else if (!av_strcasecmp(tag, "Set-Cookie")) { if (parse_cookie(s, p, >cookie_dict)) av_log(h, AV_LOG_WARNING, "Unable to parse '%s'\n", p); -- 2.34.1 Bump. I would prefer this smal thing to be fixed upstream, than adding workaround. Thanks. LGTM, will push tomorrow if no objections. - Leo Izen ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH v2] avformat/http: copy only mime type from Content-Type
On Thu, 1 Jun 2023 at 21:44, Kacper Michajłow wrote: > > Content-Type can include charset and boundary which is not a part of > mime type and shouldn't be copied as such. > > Fixes HLS playback when the Content-Type includes additional fields. > > Signed-off-by: Kacper Michajłow > --- > libavformat/http.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavformat/http.c b/libavformat/http.c > index 0817aafb5b..fd931c2d8e 100644 > --- a/libavformat/http.c > +++ b/libavformat/http.c > @@ -1205,7 +1205,7 @@ static int process_line(URLContext *h, char *line, int > line_count) > } > } else if (!av_strcasecmp(tag, "Content-Type")) { > av_free(s->mime_type); > -s->mime_type = av_strdup(p); > +s->mime_type = av_get_token((const char **), ";"); > } else if (!av_strcasecmp(tag, "Set-Cookie")) { > if (parse_cookie(s, p, >cookie_dict)) > av_log(h, AV_LOG_WARNING, "Unable to parse '%s'\n", p); > -- > 2.34.1 > Bump. I would prefer this smal thing to be fixed upstream, than adding workaround. Thanks. ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".