diff mbox

[FFmpeg-devel] avformat/rtmphttp: fix bug for rtmphttp

Message ID 20170102020535.28872-1-lq@chinaffmpeg.org
State Accepted
Commit 16ff54664a229e167b46c404e0c28a1dac7ba58c
Headers show

Commit Message

Liu Steven Jan. 2, 2017, 2:05 a.m. UTC 
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>
---
 libavformat/rtmphttp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Michael Niedermayer Jan. 2, 2017, 7:46 p.m. UTC | #1 
On Mon, Jan 02, 2017 at 10:05:35AM +0800, Steven Liu wrote:
> 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>
> ---
>  libavformat/rtmphttp.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

applied

thx

[...]
diff mbox

Patch

diff --git a/libavformat/rtmphttp.c b/libavformat/rtmphttp.c
index e5ce10c..ef6146c 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 */