Message ID | 20230409140853.28858-7-anton@khirnov.net |
---|---|
State | Accepted |
Commit | f2c8dff9067ce04bf9db44dcae95f1649a623217 |
Headers | show
Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp1592039pzb; Sun, 9 Apr 2023 07:12:05 -0700 (PDT) X-Google-Smtp-Source: AKy350bTQIk7wDMuKPghEkOx2xt3Gtxf4hR79L39IwGrN1kEHfIOwfxIL98KzkZr0XJOaF4/VlhV X-Received: by 2002:aa7:c317:0:b0:504:8b5c:a961 with SMTP id l23-20020aa7c317000000b005048b5ca961mr3635474edq.18.1681049524816; Sun, 09 Apr 2023 07:12:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681049524; cv=none; d=google.com; s=arc-20160816; b=NZe/WljGcZcvL1platiFWVDrIS3cqkNJ4wUV5zKDk3eWNvV7zUkwE4/Rd9pHnSjyMN jJ8I/IwgeW1iiUM7Dq1yK480r1Neci6dwE8ZY/sFXLStn0+WuZihOSIlseKSAAu5NghV OppmzrpQ/PhGsb3hHBJc6U36iUmqtU1xhBaFCUIgtJv1S5ue+/ELca+fzdHgQ+mgham1 tiUNW3D0w75JivwU0zxu4upZF/Dw06nEbUFKT7QB6gCVbz6W355ySO4myAEGrS6rypf6 lDT5V3qWBr3sTezJMAZxX5NlSyoD0Y+GVd/AMAzyoXDqBlndiqYnsqnHk2+QP2m6A0FU RH8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=f6dYN4SwzJEdFJAz28pzKhufL0WSYFiULXrpLpTYnwM=; b=AKf0NOOUZ10Ifk7iUHVjoAoU88J2SMlWZXADkOeRwh8HHZvKbOFe2Md2dUwFavEXWS lPjT1FeICd629oLziPp71FhFpE4osUa0wX71Tg0E7/xK0FgT+jWR+vtv+6JzFdzNxF3/ czrazyzuRXbjuH1MR4XY60AFgbJjWhSNASOmNSkT1GznihUgJ9IO1D76dGlslhHIT8O/ bcnwq+117Lt+UA89C1PovW5gH+fLFd+xwm6RlvcGwBnwiBNYv4qiGMKxRuLLQiOfRPvv Kvu8UMGZu6qxPnZocf4BDKAcV1hXO4HHQj+kgYCZfL7M1GW/EVKOUUkYtvQUL26hZhs7 LQZg== 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: <ffmpeg-devel-bounces@ffmpeg.org> Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l7-20020aa7c3c7000000b00504937f1e7asi2071445edr.336.2023.04.09.07.12.04; Sun, 09 Apr 2023 07:12:04 -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; 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 3702368BD97; Sun, 9 Apr 2023 17:09:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2F59368BCDC for <ffmpeg-devel@ffmpeg.org>; Sun, 9 Apr 2023 17:09:16 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id A4905240591 for <ffmpeg-devel@ffmpeg.org>; Sun, 9 Apr 2023 16:09:12 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id BkwwT9kjoJka for <ffmpeg-devel@ffmpeg.org>; Sun, 9 Apr 2023 16:09:11 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 27A5F2405B5 for <ffmpeg-devel@ffmpeg.org>; Sun, 9 Apr 2023 16:09:10 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 09C053A0586 for <ffmpeg-devel@ffmpeg.org>; Sun, 9 Apr 2023 16:09:10 +0200 (CEST) From: Anton Khirnov <anton@khirnov.net> To: ffmpeg-devel@ffmpeg.org Date: Sun, 9 Apr 2023 16:08:31 +0200 Message-Id: <20230409140853.28858-7-anton@khirnov.net> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230409140853.28858-1-anton@khirnov.net> References: <20230409140853.28858-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 07/29] fftools/ffmpeg: drop a useless goto X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org> List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel> List-Post: <mailto:ffmpeg-devel@ffmpeg.org> List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> X-TUID: 7AlfqfkQaRip |
Series |
[FFmpeg-devel,01/29] fftools/ffmpeg: move OutputStream.vsync_frame_number to Encoder
|
expand
|
Context | Check | Description |
---|---|---|
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 1f50b82794..1cd9a8f29f 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -2905,7 +2905,7 @@ static int transcode(void) ret = transcode_init(); if (ret < 0) - goto fail; + return ret; if (stdin_interaction) { av_log(NULL, AV_LOG_INFO, "Press [q] to stop, [?] for help\n"); @@ -2975,11 +2975,7 @@ static int transcode(void) hw_device_free_all(); - /* finished ! */ - ret = 0; - - fail: - return ret; + return 0; } static BenchmarkTimeStamps get_benchmark_time_stamps(void)