From 16ff54664a229e167b46c404e0c28a1dac7ba58c Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 2 Jan 2017 10:05:35 +0800 Subject: avformat/rtmphttp: fix bug for rtmphttp if the http server don't response the http command, then the thread will be blocked and never be interrupted. Reported-by: yinyunjiang Signed-off-by: Steven Liu Signed-off-by: Michael Niedermayer --- libavformat/rtmphttp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavformat/rtmphttp.c') diff --git a/libavformat/rtmphttp.c b/libavformat/rtmphttp.c index e5ce10ca4f..ef6146ca86 100644 --- a/libavformat/rtmphttp.c +++ b/libavformat/rtmphttp.c @@ -208,7 +208,7 @@ static int rtmp_http_open(URLContext *h, const char *uri, int flags) } /* alloc the http context */ - if ((ret = ffurl_alloc(&rt->stream, url, AVIO_FLAG_READ_WRITE, NULL)) < 0) + if ((ret = ffurl_alloc(&rt->stream, url, AVIO_FLAG_READ_WRITE, &h->interrupt_callback)) < 0) goto fail; /* set options */ -- cgit v1.2.3