summaryrefslogtreecommitdiff
path: root/libavformat/rtmphttp.c
diff options
context:
space:
mode:
authorSteven Liu <lq@chinaffmpeg.org>2017-01-02 10:05:35 +0800
committerMichael Niedermayer <michael@niedermayer.cc>2017-01-02 19:35:47 +0100
commit16ff54664a229e167b46c404e0c28a1dac7ba58c (patch)
tree4c837bed761d9ccbd80e1bda85bfa7416844c7ea /libavformat/rtmphttp.c
parent3d8a8fd27e63f97bba5fd3da7c3e81c8bc126279 (diff)
downloadffmpeg-16ff54664a229e167b46c404e0c28a1dac7ba58c.tar.gz
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 <yinyunjiang1991@qq.com> Signed-off-by: Steven Liu <lq@chinaffmpeg.org> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/rtmphttp.c')
-rw-r--r--libavformat/rtmphttp.c2
1 files changed, 1 insertions, 1 deletions
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 */