From patchwork Sun Apr 8 00:17:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 8351 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp1005024jad; Sat, 7 Apr 2018 17:17:27 -0700 (PDT) X-Google-Smtp-Source: AIpwx49OYGOcuccjpEzRxo9U/J6NIVXjXBj7p8wVqMsefyFADuNyJG7HkHI5XZWnCPLwzcXDXW08 X-Received: by 10.223.144.195 with SMTP id i61mr25032688wri.227.1523146647887; Sat, 07 Apr 2018 17:17:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523146647; cv=none; d=google.com; s=arc-20160816; b=D0nJX5Vq8ZIo9mzqhjuwkM+u1FTkrLrjXesS5hXwXKIHwzilCUzvkCewzk+EGDTj7U pmQgd5It/kivvhFMNzagt3MTK7jOV/hwFROGFAEKnpsdLWksIyHqI/2KoaSoAAM9f6xB Rbrt5U9Z4fZRmK6uDvtfbJ2WuzYulU4EZXTloR7KYMh6BgJXWJ6R2pxFCNKQARkh9k7G DF8+QualQkt4C2iuy7Vb0TGVbU6QVIeKywGEKHzefqhLy+6XkbzLwGCv5bIYNTdQzUyk Jj7hPegwlHO/KSYG1PDZ3keafcLqLYNzdaLkXUWJsbE2hiwV+J3JcCA8aBIppKhs/V0O g4LQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :content-language:mime-version:user-agent:date:message-id:from:to :dkim-signature:delivered-to:arc-authentication-results; bh=hwBJLtWSuQaVNnVV22PjMEJsdZqtbKOnhSoDO8cOWRc=; b=fQJ3kxC3vK4JppRVn3FnlC+7FB0kKB4Heeh+ZGMic/+SG+ydN2ycYrsmBmJ95+fTkW WUNbqz6jARSJjFt0FJk4W4KyIAZfTe/G7dKTTDG+3472pX7mgZE5FOZK+2HabwdkW6tw VdSdbblmmIuxYbHJPB1tz07skakhqtxOadulRPV7qNhHVwSmU9kEQzYeau4c1eq2GV2B 0F7llr8VhjDJY2zoc41ABDB5wXTfXTJkuquPeYYcPofattbP3MvOwmlVIzjb5/ULsj9R CHtbLEMWDxJgjRgsfpf/yCU2m859lXAauOY8EYR5+w/qa8UyPrEFI4j8hVbOyMVptZdR XwVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=BYjRxY13; 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=QUARANTINE 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 x21si3138673wme.200.2018.04.07.17.17.26; Sat, 07 Apr 2018 17:17:27 -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=@gmail.com header.s=20161025 header.b=BYjRxY13; 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=QUARANTINE 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 6E69E689C8B; Sun, 8 Apr 2018 03:17:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f178.google.com (mail-pf0-f178.google.com [209.85.192.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D625F689733 for ; Sun, 8 Apr 2018 03:16:55 +0300 (EEST) Received: by mail-pf0-f178.google.com with SMTP id y66so3361887pfi.7 for ; Sat, 07 Apr 2018 17:17:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=RYDZnTiSwwQrNT2pFsBBCHBNsGj0qRccDy+Juv+7GgE=; b=BYjRxY13qq2iilDydLKlLgBQrWl7VC7pHiBDw3/9QitWPketz83VvwvvSUJzXD9o+J Dx7hoTjtdmjNx8RPWJR/hOA044u0nUcJet+L8FVPX+HaFkzRmM7O9UFaWjJ5tnFkNUCF 1XPjEmSP/ZtS+JJwGdT3WpUsVESNSm4s4BzGAu2nSsTdolvGCDmtZSmpfWVRa0bVxIFV bQI/ouQ7VNlOuTXVSsaIurdejm82JjFnbDaF4bLBlSoHCHQDwxFdG1SqJux0p1ZvpWXQ WWoeR2MOBX5PrDPwD1YnHh8QaIm6zlfpMTuQIGjNvEpV2SlWjHUM5lQruKUwqsaCLpSJ 5iaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language; bh=RYDZnTiSwwQrNT2pFsBBCHBNsGj0qRccDy+Juv+7GgE=; b=nxUkhmeMBL0o75wYgfPExJVctKMrpxjvNYQwpRfp/UaUGNdP5KBpzywK+bptIlr3pD fNs8RrMm+yxeASy/2RMipIxyz8kaAQjdKdAXaJUrMMMmEip4k63fHlGWES4lxVNYW8Wv t0I+WDcsPEEI18ebkCv/fYB/owQctyccQyrdHe8W+do+7Tb+R59Afkh3xjk1wcGbjMC6 5ZU+oRHXZKmwvUC8wzzbrdc4q1yP5OxoCJ/9Taaz0tKwC0ftDhCpTl9S/7Osdqj0whv8 ddbjgZCzL/2QVqPHWeHSkl8ZX9EykJlmAMW+ObMIy3wUm0sokpQkcTtByFiXb1RipeKy 0+HA== X-Gm-Message-State: AElRT7Ekhgn1d9JSR6ykPh80tr6++icae1qvbRjdx/U6Qt8A5TH6FgWX h7bnSUu+O0JhhII4CQ1FibccmGZ+ X-Received: by 10.101.96.65 with SMTP id b1mr21642406pgv.340.1523146636523; Sat, 07 Apr 2018 17:17:16 -0700 (PDT) Received: from [10.67.68.20] ([192.55.54.40]) by smtp.gmail.com with ESMTPSA id r76sm28469933pfl.24.2018.04.07.17.17.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 07 Apr 2018 17:17:15 -0700 (PDT) To: FFmpeg development discussions and patches , Michael Niedermayer From: Jun Zhao Message-ID: Date: Sun, 8 Apr 2018 08:17:12 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 Content-Language: en-US Subject: [FFmpeg-devel] [PATCH 1/2] avformat/avio: make the logic simple 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From 733dfb98152a7a629e0440f6f807f76c2b2a9584 Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Sun, 8 Apr 2018 08:05:08 +0800 Subject: [PATCH 1/2] avformat/avio: make the logic simple remove the "ret" to make the code simple and generic. Signed-off-by: Jun Zhao --- libavformat/avio.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavformat/avio.c b/libavformat/avio.c index 63e82872f7..663789ec02 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -663,8 +663,7 @@ int ffurl_shutdown(URLContext *h, int flags) int ff_check_interrupt(AVIOInterruptCB *cb) { - int ret; - if (cb && cb->callback && (ret = cb->callback(cb->opaque))) - return ret; + if (cb && cb->callback) + return cb->callback(cb->opaque); return 0; }