From patchwork Mon Jan 2 02:05:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 2020 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp3785757vsb; Sun, 1 Jan 2017 18:06:07 -0800 (PST) X-Received: by 10.28.15.5 with SMTP id 5mr52448816wmp.141.1483322767204; Sun, 01 Jan 2017 18:06:07 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s62si45610355wms.127.2017.01.01.18.06.06; Sun, 01 Jan 2017 18:06:07 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EFFD6689B3D; Mon, 2 Jan 2017 04:05:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbg65.qq.com (smtpbg65.qq.com [103.7.28.233]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EECE6689A30 for ; Mon, 2 Jan 2017 04:05:52 +0200 (EET) X-QQ-mid: bizesmtp1t1483322738taa0l01sh Received: from localhost (unknown [47.90.47.25]) by esmtp4.qq.com (ESMTP) with id ; Mon, 02 Jan 2017 10:05:37 +0800 (CST) X-QQ-SSF: 01100000008000F0F521000A0000000 X-QQ-FEAT: pJiIyMrDeHvLxlbLfa/WDM81I+31x5MKze1zfyPre9QMZRDGDJ991Zy0Rju8c JT4Po4RWKaNewOju9v8xbfAVDhWwr8jXa1WJdNDv02ZW3Xluo1h6aXwMlNujQMrDUfcgEGW bHa209MdPqA33yYOMxPqVoPibQtYdK3yoF49ISgMJxeFSVYGqyBwwC1NrfO9uDkl1hWhJ+k ls8gZhXdSg9ttS+kTSBla/bzGD496YMDVKqtVDoUuHqTyoQs9tEFKe8g+x+ZULvDwwL2hnN zNfQ== X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Mon, 2 Jan 2017 10:05:35 +0800 Message-Id: <20170102020535.28872-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.10.1.382.ga23ca1b.dirty X-QQ-SENDSIZE: 520 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH] avformat/rtmphttp: fix bug for rtmphttp X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Steven Liu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" 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 --- 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 */