From patchwork Tue Nov 3 10:31:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 23349 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 09FAC44BC01 for ; Tue, 3 Nov 2020 13:34:15 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D48F868AD3D; Tue, 3 Nov 2020 13:34:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5781F689BD4 for ; Tue, 3 Nov 2020 13:34:08 +0200 (EET) Received: by mail-pl1-f196.google.com with SMTP id t22so8424092plr.9 for ; Tue, 03 Nov 2020 03:34:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=uJonePs7KVII+LTlCZ7WaJr09OI+w/SX5gO+IPkix6c=; b=lkXdSEDbCPiMs95fZSUa6RgsDkCiCxBpyFfO8YvvVu06tuYvyo55W+k8q9t5P9Tvmm 6QpMA495eyAjE2URWrJS1HRHFhdWsyKs3iGe2Qcw1DjgmCliiiubMt7vfnwGKjvuDScb VPTveC5hFquiODNw35WaHGh1KHRyL/TWABHY1DidX2qlfS8bX+SBvRyhrNI3/sAQbryl 0t1nlu2jlwmrGCr2LtXGve2Av6Lce3fwBX00QlIIW6FQiyAog0bJprxo8k1kTZYPxAgX i5r5zVzIRnZy5XztcAq9Lm28q/gYkf+9uY7tvDonCHQ09HjrcwgD2Ra2BiBqWkSLrNax 4pnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=uJonePs7KVII+LTlCZ7WaJr09OI+w/SX5gO+IPkix6c=; b=Na2op9gdDUW/fyI0tcjUzrfbcqky9jUqDXAZ8XmH2mMPRMnISEY1YChiWzdLfgQpYk 8iXv8OadtZtM0e5TxVAlc91rEJULhMK4Wui/P7StdNtoKWRf4/ld9S1igrBcWc8lE1kL uStoRCc03ZeerxtcuhJTjBpPcbUTyyvRFFVR81yNRuYIkFsVrlyazMUZbV+5wxlBeeKa htjevnR9CpcySVs/ox6XYhdiOkTUTpmTnp4/ilZ1jRrOna9EF+ABIwH5vQ4ORpNdf5IS kVvtvzjadkmfHdCZDz7Pw+YZawVwh/ED1TeruLW/WpEj+KKj2l9r0Gulk1V6S8T08/Fu iTgg== X-Gm-Message-State: AOAM5322GYmTT1mk77h3pX58aEhoChz7xH7oLtkc0DQi3Ddr7fkqv9q1 a9bY7+8wjFrMRKXKPrjQ3NCbFWlWSNg= X-Google-Smtp-Source: ABdhPJz53d9c+DB4vYLpwu7bCN78SzvQWY8PUDdyrUwgyDUOcxWzxYVfl0U/9j1aH85d/WowyuyDxw== X-Received: by 2002:a17:902:9a89:b029:d6:c37c:7c69 with SMTP id w9-20020a1709029a89b02900d6c37c7c69mr11692724plp.11.1604399506592; Tue, 03 Nov 2020 02:31:46 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id w13sm7009845pfd.49.2020.11.03.02.31.45 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Nov 2020 02:31:45 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 3 Nov 2020 18:31:41 +0800 Message-Id: <1604399501-20052-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH] avformat/rtsp: support infinite initial_timeout for rtsp option 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavformat/rtsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 49c2d52..4427bd2 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -2049,7 +2049,7 @@ static int udp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st, } } #endif - } else if (n == 0 && --runs <= 0) { + } else if (n == 0 && rt->initial_timeout > 0 && --runs <= 0) { return AVERROR(ETIMEDOUT); } else if (n < 0 && errno != EINTR) return AVERROR(errno);