From: Steven Liu <lq@chinaffmpeg.org>
Date: Mon, 2 Jan 2017 02:05:35 +0000 (+0800)
Subject: avformat/rtmphttp: fix bug for rtmphttp
X-Git-Tag: android-x86-7.1-r1~2583
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=16ff54664a229e167b46c404e0c28a1dac7ba58c;p=android-x86%2Fexternal-ffmpeg.git

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>
---

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 */