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

Steven Liu git at videolan.org
Mon Jan 2 21:49:44 EET 2017


ffmpeg | branch: master | Steven Liu <lq at chinaffmpeg.org> | Mon Jan  2 10:05:35 2017 +0800| [16ff54664a229e167b46c404e0c28a1dac7ba58c] | committer: Michael Niedermayer

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 at qq.com>
Signed-off-by: Steven Liu <lq at chinaffmpeg.org>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=16ff54664a229e167b46c404e0c28a1dac7ba58c
---

 libavformat/rtmphttp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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



More information about the ffmpeg-cvslog mailing list