From patchwork Tue Jan 14 03:13:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 17334 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 07C8E44BB86 for ; Tue, 14 Jan 2020 05:14:04 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E738A68B060; Tue, 14 Jan 2020 05:14:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E6E0668A16A for ; Tue, 14 Jan 2020 05:13:57 +0200 (EET) Received: by mail-wr1-f68.google.com with SMTP id b6so10701814wrq.0 for ; Mon, 13 Jan 2020 19:13:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wxwf/5kem7PhUjBclWJ5G4FvmEOKpSNeYUG0Uxne1fU=; b=m/IH2euFDU9TzBsn6rDUmtMCyqAO2+Fpxmz/UTh9r2v3hOpPDLqh4XOSVF8zBZkCRN kjHOCHogdupwtVgWCRHZ6to0HkK/Ehs7OICThFWNNu3yHZ7cFDOa4rK5g351mYr/G/H1 5NS6sn3PnvN/9StI8JdrlwYQjxIBHdd9e/Uh4OjlLhQqFbrlZ7Alyvb438EMfNIELar2 C6BMPh22KXxb/Hbmofckzl+2GuyvPWgl1pHisweUYUF9GLBgD4+rZYffinf+J3ULdT6F AqOQpG4dBoRmG30veObbXnhGW7ceJouNHFgjKEITg4DQ5cVJ9fs2csAQz31Vx26aFrgV xF+A== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=wxwf/5kem7PhUjBclWJ5G4FvmEOKpSNeYUG0Uxne1fU=; b=VnocKwheNj3QdJ/9wYS6UnvjwmK7YlmjCbLh3VcJAl8wNX5bRZj6QkFTGG16jrfX4u IPsGBVHfCwJu/wqND5YDGgTgxhvTZZK6lPR5piBR9d6NqyZclHUiYv0W30DkDGBXccS8 bgXXMJjnX4izOtju/Jy3fQoi+nEHBWrAd65D192XZ5sxHF4hD+ZMOcmMBbJL9vKGX3UR 6Zi6kZW2yyyeBz0fgnI49FEQgihXsBm+KjMmCUFbMbsTl01Hv5RiJNwlENY5BicWl4JF Xh9U+iP2VHU1aBezR9gEakkm7HSDlVHKd8QnO3FvIYv8a4e4Z9B9gMN20RC9p9fT6V56 tL2g== X-Gm-Message-State: APjAAAWaq3qSjA2owvQKlfGvw6luuFQKONWJ/SxET/cgr3m4bxUAX02A xvYQPhwsp8Eh0xNBm/viyICK9fTb X-Google-Smtp-Source: APXvYqz1dDkmR8QCb8bC9/m60Uvq5ujRuJ43OLvv2E88IdWiFKENskXS0aqJ1/+0TPz15Z1MGAxl2g== X-Received: by 2002:a5d:46c7:: with SMTP id g7mr22092106wrs.11.1578971637268; Mon, 13 Jan 2020 19:13:57 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08bbf.dynamic.kabel-deutschland.de. [188.192.139.191]) by smtp.gmail.com with ESMTPSA id w20sm16588476wmk.34.2020.01.13.19.13.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jan 2020 19:13:56 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 Jan 2020 04:13:31 +0100 Message-Id: <20200114031336.24096-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200114031336.24096-1-andreas.rheinhardt@gmail.com> References: <20200114031336.24096-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/7] avformat/segafilmenc: Postpone check for existence of video stream 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Up until now, the Sega FILM muxer complained if the first stream wasn't a video stream that there is no video stream at all which is of course nonsense. So postpone this check. Signed-off-by: Andreas Rheinhardt --- libavformat/segafilmenc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/segafilmenc.c b/libavformat/segafilmenc.c index d721ec38fa..56fc59a811 100644 --- a/libavformat/segafilmenc.c +++ b/libavformat/segafilmenc.c @@ -183,11 +183,11 @@ static int film_init(AVFormatContext *format_context) } film->video_index = i; } + } - if (film->video_index == -1) { - av_log(format_context, AV_LOG_ERROR, "No video stream present.\n"); - return AVERROR(EINVAL); - } + if (film->video_index == -1) { + av_log(format_context, AV_LOG_ERROR, "No video stream present.\n"); + return AVERROR(EINVAL); } if (audio != NULL && get_audio_codec_id(audio->codecpar->codec_id) < 0) {