* [FFmpeg-devel] [PATCH v2] avformat/http: copy only mime type from Content-Type
@ 2023-06-01 19:43 Kacper Michajłow
2023-06-16 17:46 ` Kacper Michajlow
0 siblings, 1 reply; 4+ messages in thread
From: Kacper Michajłow @ 2023-06-01 19:43 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Kacper Michajłow
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 <kasper93@gmail.com>
---
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 **)&p, ";");
} else if (!av_strcasecmp(tag, "Set-Cookie")) {
if (parse_cookie(s, p, &s->cookie_dict))
av_log(h, AV_LOG_WARNING, "Unable to parse '%s'\n", p);
--
2.34.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".
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [FFmpeg-devel] [PATCH v2] avformat/http: copy only mime type from Content-Type
2023-06-01 19:43 [FFmpeg-devel] [PATCH v2] avformat/http: copy only mime type from Content-Type Kacper Michajłow
@ 2023-06-16 17:46 ` Kacper Michajlow
2023-06-29 0:12 ` Leo Izen
0 siblings, 1 reply; 4+ messages in thread
From: Kacper Michajlow @ 2023-06-16 17:46 UTC (permalink / raw)
To: ffmpeg-devel
On Thu, 1 Jun 2023 at 21:44, Kacper Michajłow <kasper93@gmail.com> 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 <kasper93@gmail.com>
> ---
> 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 **)&p, ";");
> } else if (!av_strcasecmp(tag, "Set-Cookie")) {
> if (parse_cookie(s, p, &s->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-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [FFmpeg-devel] [PATCH v2] avformat/http: copy only mime type from Content-Type
2023-06-16 17:46 ` Kacper Michajlow
@ 2023-06-29 0:12 ` Leo Izen
2023-06-29 21:41 ` Leo Izen
0 siblings, 1 reply; 4+ messages in thread
From: Leo Izen @ 2023-06-29 0:12 UTC (permalink / raw)
To: ffmpeg-devel
On 6/16/23 13:46, Kacper Michajlow wrote:
> On Thu, 1 Jun 2023 at 21:44, Kacper Michajłow <kasper93@gmail.com> 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 <kasper93@gmail.com>
>> ---
>> 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 **)&p, ";");
>> } else if (!av_strcasecmp(tag, "Set-Cookie")) {
>> if (parse_cookie(s, p, &s->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-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [FFmpeg-devel] [PATCH v2] avformat/http: copy only mime type from Content-Type
2023-06-29 0:12 ` Leo Izen
@ 2023-06-29 21:41 ` Leo Izen
0 siblings, 0 replies; 4+ messages in thread
From: Leo Izen @ 2023-06-29 21:41 UTC (permalink / raw)
To: ffmpeg-devel
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 <kasper93@gmail.com> 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 <kasper93@gmail.com>
>>> ---
>>> 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 **)&p, ";");
>>> } else if (!av_strcasecmp(tag, "Set-Cookie")) {
>>> if (parse_cookie(s, p, &s->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-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-06-29 21:41 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-01 19:43 [FFmpeg-devel] [PATCH v2] avformat/http: copy only mime type from Content-Type Kacper Michajłow
2023-06-16 17:46 ` Kacper Michajlow
2023-06-29 0:12 ` Leo Izen
2023-06-29 21:41 ` Leo Izen
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