From patchwork Wed Nov 22 15:28:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Buitenhuis X-Patchwork-Id: 6276 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp309854jah; Wed, 22 Nov 2017 07:29:46 -0800 (PST) X-Google-Smtp-Source: AGs4zMY/eYSEtFy3vLZJ/SNPfA6tasGVfK0gPmxYKFt8LQI/RDm8pal0gew6xvYZZbkEEpSuPgeF X-Received: by 10.28.167.86 with SMTP id q83mr758542wme.102.1511364586427; Wed, 22 Nov 2017 07:29:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511364586; cv=none; d=google.com; s=arc-20160816; b=m8DTj6qsqabtTxDvoKUQ0yNctbJdzos+bw7K77ciAtQoGxrnguFqAVlzQZ0tgkr2HI 2b3gPhHBf1tXeIFjv+C+dOejiz9dWoVVjFR+waRx0Espx9t4wbluSPtakb22ytG4R6c6 LW3gMF6AvtCAF746HSRoDO+XcHX1n6R7L5yoMFV+nVtPAgfpCK/DlYmuup6fMtiG+cjg /Jbh0VJWco73GPuQTdwOP/6g5HQaJgJvXI8G/moanSqEBrTpx1zjsS66qy9vePQPNMUG wC9LfflaD6G84jHBcVlWhnXkx57aktrLa+YGm7PlrYP2q3zKsBb4E++p1//ruz15y2CJ hx0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=TolK4eCDqt5GLyZCuZ2Ya9ZaPo6T4TrCLloaPAuasBw=; b=iYo61TdovwbXn6wdgQBiajVK5L6rh6RX7ENlR8/ivjKbi1Zui8jyYPdmFyRZsLPy/f cgByu7dqAnQbmMH7rlpiXqGhrLUk1VOqiFYYHgmiBvPDAy+osgtVzORj5kpLQSuCDuMo nuM39DFPLutS27GXbkzIoTglAWrwMoIDrkj76VZ7/az1RQRY40+dB2mBS/KQy+CVC4wW LQ6aioBSUnhB+Kreomv6DDvRECfixxR6Rgmc2hQZwM/J0/FeUkh0XUNYn3EwxtGEck59 YdHgv1L0T9ICdn0KWx0Kg1SNsogwpWsKcA0YKhSNE+bg2MoFLusfZnUUrhEB0jcvYCZ5 8u8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=LnoDLe4b; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r24si10957356wrr.167.2017.11.22.07.29.45; Wed, 22 Nov 2017 07:29:46 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=LnoDLe4b; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A83D068A1B0; Wed, 22 Nov 2017 17:29:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 45EDC68A1AD for ; Wed, 22 Nov 2017 17:29:22 +0200 (EET) Received: by mail-wr0-f196.google.com with SMTP id z75so13524671wrc.5 for ; Wed, 22 Nov 2017 07:29:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=oa9W9PmeaQWt533S7k5pbL8zkxv0ulL/of0CMD00kbM=; b=LnoDLe4bnK2I12hu2KH74Yk5sx31jMElptmsgwns20pnjVDfWExM551mX9B9cg5FPH iQb6VwX2hVIlgA7cNeUufps8FxD3RZdc5FkF73i3syJmoSld+RaKj4DuJ5Lz+YaEbK4O QC6oBdP33y8/qCsTbdoXCQxfFSLf/V1yeR5Ivc2+5ZtzIrS+kdIL9L0EeNfudPwILGXn zLE1j/IpgJSK1U9XRyLdwDofd11JhGktWFsf5vFYVXqhjrwP0zyTxZrZ8gXMu4OA1ZvA Wl/z1IaEEpEoG+CKInoWSikyIhKKud03FVRh1+4XIxpokrm5Unm+t4q1SaQKbH/6Wjy3 ya6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=oa9W9PmeaQWt533S7k5pbL8zkxv0ulL/of0CMD00kbM=; b=Bw78IyFOYHjVCBqCsVJKpFBb+d8Dlmk70ipTkg/QbgQ2BFWV+1Zpoye04LxSjvyouW q9UzTVzVLZSNBqjeZHg+Ax3fpOgO/GA0S9nk7U5NT3lrODtPqp8X1Yh4vxj/Rvn6J4h7 0EHrEZnV6nbvjQ5jH8VPMCXQ0ZZ293apIrGELrRLj9qfu+rhMv129alviyiz4bpX8p6j 1FLgi9CbCjeC9CoR0DTS8Y8ZaSPYMAYOm4Te6dZoGI/wxFAaDYb9nlOSp7Mtg1pMGDnu lEad+QUpt781lV7SZJcWKhqhnzaBr24+tUpr4chMFwAKqO9Qro6VrY4LRzzKd7/LRd7o xsbA== X-Gm-Message-State: AJaThX52FxwMRkQXy75hff2eyMddZTQQMAFKN1ewYzXtCSejy/I+lccl SjVIZiE3DYbMjQacQudF9qpdJ/7P X-Received: by 10.223.164.81 with SMTP id e17mr17236051wra.16.1511364561965; Wed, 22 Nov 2017 07:29:21 -0800 (PST) Received: from vimeo-vm.localdomain ([149.12.3.113]) by smtp.gmail.com with ESMTPSA id 186sm3664921wmm.47.2017.11.22.07.29.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Nov 2017 07:29:21 -0800 (PST) From: Derek Buitenhuis X-Google-Original-From: Derek Buitenhuis To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 Nov 2017 15:28:42 +0000 Message-Id: <1511364522-40586-4-git-send-email-derekb@vimeo.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1511364522-40586-1-git-send-email-derekb@vimeo.com> References: <1511364522-40586-1-git-send-email-derekb@vimeo.com> Subject: [FFmpeg-devel] [PATCH 3/3] udp: Actually fail when we're missing required options, like the "warning" says. 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Derek Buitenhuis --- There was no reasoning in the commit that added this, so maybe someone on the list has some insights. --- libavformat/udp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/udp.c b/libavformat/udp.c index 7bbd282..6319655 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -963,8 +963,8 @@ static int udp_open(URLContext *h, const char *uri, int flags) */ if (is_output && s->bitrate && !s->circular_buffer_size) { - /* Warn user in case of 'circular_buffer_size' is not set */ - av_log(h, AV_LOG_WARNING,"'bitrate' option was set but 'circular_buffer_size' is not, but required\n"); + av_log(h, AV_LOG_ERROR,"'bitrate' option was set but 'circular_buffer_size' is not, but required\n"); + goto fail; } if ((!is_output && s->circular_buffer_size) || (is_output && s->bitrate && s->circular_buffer_size)) {