From patchwork Thu Nov 16 18:34:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Devin Heitmueller X-Patchwork-Id: 6122 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp6149349jah; Thu, 16 Nov 2017 10:34:45 -0800 (PST) X-Google-Smtp-Source: AGs4zMaJNMxM8PnjJfX9dqNZ+CmQNmgzwiXx4LW2hQY6UM1VB7zCuvfzeFPrslKcFoOD7xPUj0Bk X-Received: by 10.223.174.147 with SMTP id y19mr2449719wrc.97.1510857285626; Thu, 16 Nov 2017 10:34:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510857285; cv=none; d=google.com; s=arc-20160816; b=VKHHPeYOVzV/IYcSwkdyeZWMFC9WEedUtMU0mwYbj+Mbfsm1y3NT7c3mintpEx6sb1 sB1wSSEXBdGJsFV0oYTtUIlz048onmz1/lmhurPgQ94aq5qv3Od7bO7Rm+fJSmnSwkuc J2itgzTsil5k4h0aiRSUF8qIRA1Xywj0cSp1TVbx3tQiXbZvGDIjXWNx1ttXGnIn5VVv M6XKqLdivtINgFctYob+qynYAuCz1cLBDKehJQ95nJCXLwhFkkqD3sW32G1Wt9fPeqs9 4LdI0n/jJeg+hWYY/UtcEUl/41eLHyzd4e0VWEd3trRTDaL+1li0a5YHAFexsya5R7Ob /kXg== 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:cc: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:delivered-to:arc-authentication-results; bh=Kxjh2vwGKtJYzo41vRmlXgE0cvNRGIXSSObrNmRJy0c=; b=HRRBqY7dETPMwAm4sNOGWkhMVUNKIBeqYZDtKqEeGSLyE1SH/ETEbiAxYfYX6gSJpt C/nz7aG2HdtwJ+U+T7Vgme5REt3Vg/msEWutgu8y0wtLSQsruOkPW+4aDfK1KANTZhuU 1vfaaVdfIAYEVVXN8RJapwKP4+o04je0b6EkXMQH/+98A79fjw+fTRePfb5a++Ys59b2 YRQNrwo8f7Nb5Z1dMa2LaEr8wiPb7vCOkbkDNks3FMtthiex0eldHCievAXooK0WMuhE wSrfEKQXURlPI2XZXj0Q1TPUxY12p1/VMOnL9Fvs7LKQ3R5ADRCRMA3HTQCPQLixgmQC 5Vog== 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 n17si1431810wmi.86.2017.11.16.10.34.45; Thu, 16 Nov 2017 10:34:45 -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 9D87D689EC6; Thu, 16 Nov 2017 20:34:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from was-smtp1.livetimenet.net (50-206-97-56-static.hfc.comcastbusiness.net [50.206.97.56]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1760B68056A for ; Thu, 16 Nov 2017 20:34:12 +0200 (EET) Received: by was-smtp1.livetimenet.net with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.84_2) (envelope-from ) id 1eFOza-0002o7-AI; Thu, 16 Nov 2017 13:34:27 -0500 From: Devin Heitmueller To: ffmpeg-devel@ffmpeg.org Date: Thu, 16 Nov 2017 13:34:12 -0500 Message-Id: <20171116183417.93073-2-dheitmueller@ltnglobal.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20171116183417.93073-1-dheitmueller@ltnglobal.com> References: <20171116183417.93073-1-dheitmueller@ltnglobal.com> X-Spam-Score: -1.9 (-) Subject: [FFmpeg-devel] [PATCH 1/6] decklink: Fix case where return value wasn't being set before checked for errors 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: jgreen@ltnglobal.com, Devin Heitmueller MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" I missed an assignement which cauesd the error case to not ever be properly checked. Signed-off-by: Devin Heitmueller --- libavdevice/decklink_enc.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavdevice/decklink_enc.cpp b/libavdevice/decklink_enc.cpp index 070bfad..1fb986e 100644 --- a/libavdevice/decklink_enc.cpp +++ b/libavdevice/decklink_enc.cpp @@ -300,7 +300,7 @@ static int decklink_construct_vanc(AVFormatContext *avctx, struct decklink_ctx * if (ret != 0) return AVERROR(ENOMEM); - klvanc_set_framerate_EIA_708B(pkt, ctx->bmd_tb_num, ctx->bmd_tb_den); + ret = klvanc_set_framerate_EIA_708B(pkt, ctx->bmd_tb_num, ctx->bmd_tb_den); if (ret != 0) { av_log(avctx, AV_LOG_ERROR, "Invalid framerate specified: %lld/%lld\n", ctx->bmd_tb_num, ctx->bmd_tb_den);