From patchwork Tue Oct 17 22:11:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 5615 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp679927jah; Tue, 17 Oct 2017 15:12:52 -0700 (PDT) X-Received: by 10.223.130.20 with SMTP id 20mr4695553wrb.216.1508278371988; Tue, 17 Oct 2017 15:12:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508278371; cv=none; d=google.com; s=arc-20160816; b=rNXmFq1rH5uFETzlxVrwpfOrXs6CdKzZr5ZlqY8Tae0xAUp2vy84RfzjylXCc/1dRy 4dhz30/52U79euS2OKkJf2ZgiVf3mvutl1fDsNvfl72n43Wzc6RQb4oMyXqCWyyI9bX2 yMPIGTeBQ+TWH9EjdGuX70eCjquWnGYF4tqFqMk3ZOVUyv0eiB8jQPoESWbvJQ9bbrzX h3dl5sgS4yYcBhJvyb03UlQloS9y2Iy2rp2QOGxCQE97URDYlxFC1wZZX7xZB3WV/xB5 nlgY9JUIK993DA23YLFfKJI1joJhXzFKpAz4kqkUVb7nXmicgw8dfeLZpTJkCNT/lymU QmwA== 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=N2njwndb+lEXcAPnVE0qBZPPL7HRs1yzLSYhJns/gzo=; b=wWoluf/41zLxLgqkntu4/gt0uEAy8c1+ZwyPalbYlMuFYuYrkgqd1xNRr3AmqRqdvB sirpY6UYU5W2AnwMcWrdkQ8DSkGYZLZiVNV1Z6ajhYEEeG/5kD08Qr2awvC7M1HUyzGD IWKFdaqY8IXk+94QApOhtyMvDA4g5X48dg83FwwC27Bn9RIO5493zJ5Db0CwqgxOMJz6 vI+Lw/MMGOrFw+NIdO0KuxPJ0SCjDVwM9lC9kKg9MH+S5xLCZ5V18WX57At4OEL+XW8p 0R2n0hKhJD3KeslSeZEzFBBxM7Jx7ekaCDTiQ/Un0cm7tupeBSrza5oGOiW383U9Fn6r 43+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=B2Xg0+oH; 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 l124si7726628wmg.31.2017.10.17.15.12.51; Tue, 17 Oct 2017 15:12:51 -0700 (PDT) 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=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=B2Xg0+oH; 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 770AA689FF1; Wed, 18 Oct 2017 01:12:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f48.google.com (mail-wm0-f48.google.com [74.125.82.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F0728689ED5 for ; Wed, 18 Oct 2017 01:12:02 +0300 (EEST) Received: by mail-wm0-f48.google.com with SMTP id q132so6635053wmd.2 for ; Tue, 17 Oct 2017 15:12:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=jA7VW5+fy0UbafG+wp52jb1MjnsS7J6gLW2Gg1QKSag=; b=B2Xg0+oHFo45biT2fchQ99ho4k3NcoQ/WsbrZna86DgqDvEzfXqkR4sPDC13UyIx3B Fhomh6tMJ+LXAsjCmC7frQ6TKvJgWrZafu2WCfBhfRkkiVyJLLeU5tbWL284EXSEvZo9 cXl5n6ILp3fXAllNwWi7BPLBPqgu1QFaUIi/SdCkkfjq9hr6IW2LORaw3mfdui8GMFwj AbEv23coRaGzXf/h23dI94fX1m+X4DSFxbVi8bopNAObtLitNindUnWdFl2+PcmThpZp 810ud5LA9mKHRiaWKHiEFE79K0Q6JH81dpJ4m5/wQt3JJ15jzb4QXA7SKy8BpvMisWwc Qxzw== 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=jA7VW5+fy0UbafG+wp52jb1MjnsS7J6gLW2Gg1QKSag=; b=ptNtB3ij10cDPRtpMD62L6kN1PTJQuYSuIQOMpSus+vRAEBlgWziYVs5GAG7bHghFO sXvwBRCmm031hGW0ovzFYmX5v6jvxRL+121g5bzB6KRLNSMh177gzLrYRup2gzQi8qRT 3Iu9+SoCgVQW4ub2i8pRaZZVi9vc6urVpV0j98h7bcnR/TEzLAXPKi47koJ3RQAK6Ofv dJF5BqLgBPH6lAQI3Bm/ai+9faixZNzzQeBd9Y69h0xdq6dr6wqTsC9p/nwzobzpK6Oi oqtsMJymNAk8N9fkgTUz/46EKcBwIVbljolZNUU2xNomzek3qvZpwmNsq2FBiuKiGmcq UY7Q== X-Gm-Message-State: AMCzsaXfnI1EmDNB/4Rt3JGJU+kavyTyYZKwCl4kMTELXS/0xuHRKzf0 b7uAHnKduYIU5Ya9Z5oqd8kLYM+v X-Google-Smtp-Source: ABhQp+TCgw26ueOYLqNrCax8b5J3PW4ML0aPQpBpUvsyCInUGerh2Ri5Vb0RdxB4pS5xMcFZwE8XwA== X-Received: by 10.28.29.130 with SMTP id d124mr5251561wmd.73.1508278326612; Tue, 17 Oct 2017 15:12:06 -0700 (PDT) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id p77sm13063074wmd.28.2017.10.17.15.12.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Oct 2017 15:12:06 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Tue, 17 Oct 2017 23:11:57 +0100 Message-Id: <20171017221159.2349-5-sw@jkqxz.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171017221159.2349-1-sw@jkqxz.net> References: <20171017221159.2349-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 5/7] mxfdec: Fix return value check 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" Move the assignment out of the condition, because that was hiding the error. Fixes #6750. --- libavformat/mxfdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 118e3e40b4..e4019ac0a7 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -2311,7 +2311,8 @@ static int64_t mxf_timestamp_to_int64(uint64_t timestamp) #define SET_TS_METADATA(pb, name, var, str) do { \ var = avio_rb64(pb); \ - if ((ret = avpriv_dict_set_timestamp(&s->metadata, name, mxf_timestamp_to_int64(var)) < 0)) \ + ret = avpriv_dict_set_timestamp(&s->metadata, name, mxf_timestamp_to_int64(var)); \ + if (ret < 0) \ return ret; \ } while (0)