From patchwork Fri Nov 19 20:29:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 31510 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp2949772iob; Fri, 19 Nov 2021 12:29:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJy86b9dlwS2o4xECFaRQkeRQn2MIn8e7uzAs1WpmIDbAKQxmUvbqfjbD9XHoTW8/OoKU3Xg X-Received: by 2002:a17:907:3f07:: with SMTP id hq7mr11284939ejc.420.1637353764814; Fri, 19 Nov 2021 12:29:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637353764; cv=none; d=google.com; s=arc-20160816; b=iKicC3XgVU4QAm0NdAMNHiLkcUpjk6yT2/aK6siGM+yreV06qST1PGtZbgHQpgb/mo efh2xiV4VNcWfLQryKPSyhx3k8dtugGDCczh/fY636FoYHGepvI8aGhcnaKhs7lm1PdN zfyczo9lE/mS37OUo/oABKjoCtFQDLK2xB6E5ARNUJGoPc1NRCwDfkFvBgG3Z/XudABy ANLe025rr2YMF7gOcjTMHGk/iOcFx72zm1VLGiKpcsWljJrZ8EMOz/hiFpJFvEZjjcEo AWnkCMn/cqnUhvi189g1O2HCZj30XS1aBtoFDvUb2S1GgLHERGiR25eQZd38sWmGbfY+ /k9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=1s1VN6dsrhSlzm/mSifXMvcdrhc6i9yuLNAPn5y+S+I=; b=kLQvzaDE+pTYMD027I1xH+yZNcjVQMXnALCi33DkL9Jc+/AEtIRlMydOGVANV2Yppz EABV+8oNV9MS+JFQBycmuStoiRhJXDtjSBe1AoiGkF/Sy8jXkLfOFWyun1Ccbpc5ucHO BRRc5eXR8S1LIQ6x27RyiY5DYlQmzVFyu7/UCiS3VrQF9nA+DFcfUvhVXgKPz7xklNIO 9Nh864KwLXckrHAws8Y0QvYEowvw88iPRBPTZQ5eEwuYbTYLP/m8kfe3ggiUm3H0BP1v 3gAGYer+pIGYHHlXcZAugPXf5lLWLrhvlPp0o1VKie9/FZCzBIgzI+tuv/1LCHZRYOSv 2dsg== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id qf7si2108081ejc.581.2021.11.19.12.29.20; Fri, 19 Nov 2021 12:29:24 -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 12CE868A1F0; Fri, 19 Nov 2021 22:29:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C658D68A1F0 for ; Fri, 19 Nov 2021 22:29:08 +0200 (EET) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id BBDC8E6352; Fri, 19 Nov 2021 21:29:07 +0100 (CET) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iM9b2SvgKcHs; Fri, 19 Nov 2021 21:29:04 +0100 (CET) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id C73ABE634F; Fri, 19 Nov 2021 21:29:04 +0100 (CET) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Nov 2021 21:29:01 +0100 Message-Id: <20211119202901.19734-1-cus@passwd.hu> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/libsrt: add missing version check for snddropdelay X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Marton Balint Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: MAJ+hGh3PnA3 Signed-off-by: Marton Balint --- libavformat/libsrt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/libsrt.c b/libavformat/libsrt.c index 145eea2f7c..19b9cb9895 100644 --- a/libavformat/libsrt.c +++ b/libavformat/libsrt.c @@ -320,7 +320,9 @@ static int libsrt_set_options_pre(URLContext *h, int fd) int latency = s->latency / 1000; int rcvlatency = s->rcvlatency / 1000; int peerlatency = s->peerlatency / 1000; +#if SRT_VERSION_VALUE >= 0x010302 int snddropdelay = s->snddropdelay > 0 ? s->snddropdelay / 1000 : s->snddropdelay; +#endif int connect_timeout = s->connect_timeout; if ((s->mode == SRT_MODE_RENDEZVOUS && libsrt_setsockopt(h, fd, SRTO_RENDEZVOUS, "SRTO_RENDEZVOUS", &yes, sizeof(yes)) < 0) ||