From patchwork Sat May 11 07:23:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 13069 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 059AE4477F3 for ; Sat, 11 May 2019 10:30:44 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D7A2B680924; Sat, 11 May 2019 10:30:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 72305680607 for ; Sat, 11 May 2019 10:30:37 +0300 (EEST) Received: by mail-pl1-f196.google.com with SMTP id d3so3862944plj.11 for ; Sat, 11 May 2019 00:30:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=aa4UzWfsb4Wqg6F3zk8+GftN62+v4QVT30IIaBfJi/s=; b=CvRDD2ejI+SxbUNRG/e021Elgz2Nl4LLfPSmC9cM0MZq2fO0SGJU0/HgKwj2RLSNCB JeMZMkkYb/TwVEj+P6dTlszn1Qd9AZ3sIyCLAhOcNwII3e353DX19Sar64qvVL5v8Bvn jEb+slVzdrYT2VEm1V36v+2eXGjOJOBg+pPhafJOJnm3BuRy89xr3SSsih5pzEXIFltc 5wMFLdKw/xvLjrMPeMDK/u7jDaf9Oh/h9MuB6Myaq2uoErqh/MvBsAJzVVAfaKDOU+pL 1zRdZXDZ3PX2lLWCSaNK6sc93opRawMU9tGpZ7nCMrm2WzY1CgpyYKih2tPI1hft/Jbm T4ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=aa4UzWfsb4Wqg6F3zk8+GftN62+v4QVT30IIaBfJi/s=; b=PtdV8yNkr66N6R8Kb6nQkk/TNJVzI6iPT/DPBgy6UedHgGwyAYl4Gx1ILaX38Er5AS mr87AUGn+AdshtdgQ8CY9J7VYnAOCRjyrBkUKLrxcKF2Dx+2fjbJbYyihzXMkVYCkgK1 t4GDxDtvxqzObrgzQRe47f7cS+5Wsq9l09V6oEUHZWi1bxLLzydpaBtWuRQIaP33lS92 bE7CqXl/eyxzxTq31QGettadm1hsrO2B32E9Pe32RjAcUdf/we3z/JL7OPhtBNW7bLws NySy2e/zazJoRde++PcAp0KTipgadAdSMbOjf/wc4V+vYuKv1MiARWl3iqbmkMHj77gU 8DjA== X-Gm-Message-State: APjAAAWp7Nfm5LLIKdTu3mOwgP7wjeuPe+jE0A+bfKNsP0fiQMZw3k4x /VFKnIT4hwShg98BOCicRmnwQiFH X-Google-Smtp-Source: APXvYqzLiCU8edP+ZleXv1HMurA1UUb6frvQDX33j4E1CNSk8LzBaHWaXd1KB5Trybz7n6R929dB7A== X-Received: by 2002:a17:902:8ec8:: with SMTP id x8mr17980763plo.21.1557559429737; Sat, 11 May 2019 00:23:49 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id x4sm9196220pfm.19.2019.05.11.00.23.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 11 May 2019 00:23:49 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 May 2019 15:23:43 +0800 Message-Id: <1557559424-5566-1-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 Subject: [FFmpeg-devel] [PATCH 1/2] lavf/dashdec: fix the coding logic after open_input fail 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao setting return status following goto will never be executed, so adjust the location in the code. Signed-off-by: Jun Zhao --- libavformat/dashdec.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index 6e3e7e4..ce8bd4a 100644 --- a/libavformat/dashdec.c +++ b/libavformat/dashdec.c @@ -1793,8 +1793,8 @@ restart: ret = open_input(c, v, v->cur_seg); if (ret < 0) { if (ff_check_interrupt(c->interrupt_callback)) { - goto end; ret = AVERROR_EXIT; + goto end; } av_log(v->parent, AV_LOG_WARNING, "Failed to open fragment of playlist %d\n", v->rep_idx); v->cur_seq_no++;