From patchwork Wed Feb 24 11:53:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25953 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 A1F1F44B5C7 for ; Wed, 24 Feb 2021 13:54:22 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8E39668A326; Wed, 24 Feb 2021 13:54:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A5EA5689FD9 for ; Wed, 24 Feb 2021 13:54:20 +0200 (EET) Received: by mail-wr1-f52.google.com with SMTP id v15so1618236wrx.4 for ; Wed, 24 Feb 2021 03:54:20 -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=0OgaKIOwBR4BrluEl/wcPTGEaWbSsF9NlktOvmhry3Y=; b=aJCWhFM8xMsO7PRGC4QUECVxAQJnsOcCN062VnrEkpRn8VFYGkU+l0VDgdG+9l8TR5 CdTQHlsXP3CWsOWxCHTntO28ZyLZaPkkGaVYHqhcVDDK0ShIw3WJngC7ZVcKnIiav9rC CZtwfLJBfdVyZdArsYvAKEHBz7Bpx1/ogeUyRWOxma/ozKs3Y+B+Tz7gziIY4Z0Z+OeT o5nc1ijWKEigaOjoK/A0cwfAUZzKl1k3+xW4FRAMKz11Tlywd9rLAAWFYFZ2sXS5ag1q tiB6C82s3rHiF6mDT9y/sVG6j6Y1ttsqMGQx+Z1RiYojk1dUx9sPIZ73yDGjVuVmz98m EhSg== 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=0OgaKIOwBR4BrluEl/wcPTGEaWbSsF9NlktOvmhry3Y=; b=ZlJ2Ge2KikakLLK5Z1CA64AvwrJTADD1fBrL5nyvxQ4r9ujuMOtWbJUVL7R0a9vZuH y9qGVdTQIftwuxL4j8F9u3Q0FveHdAMVX/dQ52PshoH14kOUzS61e06p2rOAV2J+kimR tdBJq/5dPbtS8rg4+BFu0bPh8cAZxN+FUgNYpBAhghSRCQr/Xf6hdqZrx0nVb/QNQp/+ 5XFEdza2Bsrao3TrtxTB9rUsGV4rkGm6sVHCuvP6OYM5kx+1KRPW49HuZhbFpz1wvKWt WEQtuSmmC4LJQQiYoTj584VA+2ycd4Oepnld6f8+vqFi6gwWDHZp97g0Bf6dAgpJX2tp neag== X-Gm-Message-State: AOAM5328IyRDxc+MbIQkCzhu3s6zbQJP1zO6SoPVNld114ZYX2W5dtL8 BoZFdlJsmYN+iOlqs+cgr3S0j0J/b+s= X-Google-Smtp-Source: ABdhPJwtFhA7aSD5EzqprhLBB8TMDL3RBIEPvYIhW+rlEk00vQJZnYbJMEpIf0yUVEZnlkW3cewxPQ== X-Received: by 2002:a5d:474a:: with SMTP id o10mr12294167wrs.176.1614167659830; Wed, 24 Feb 2021 03:54:19 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id k15sm3911776wrn.0.2021.02.24.03.54.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Feb 2021 03:54:19 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Feb 2021 12:53:28 +0100 Message-Id: <20210224115341.794293-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210224115341.794293-1-andreas.rheinhardt@gmail.com> References: <20210224115341.794293-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 02/15] avformat/movenc: Don't check for disabled muxers 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" Signed-off-by: Andreas Rheinhardt --- Given that the name of every possible muxer here has a strlen of three or four one could even replace the strcmp by AV_RN32(s->oformat->name) == AV_RN32(#muxer). libavformat/movenc.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index cdfcbd3d76..cf0e35dd33 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -6395,13 +6395,15 @@ static int mov_init(AVFormatContext *s) /* Default mode == MP4 */ mov->mode = MODE_MP4; - if (!strcmp("3gp", s->oformat->name)) mov->mode = MODE_3GP; - else if (!strcmp("3g2", s->oformat->name)) mov->mode = MODE_3GP|MODE_3G2; - else if (!strcmp("mov", s->oformat->name)) mov->mode = MODE_MOV; - else if (!strcmp("psp", s->oformat->name)) mov->mode = MODE_PSP; - else if (!strcmp("ipod",s->oformat->name)) mov->mode = MODE_IPOD; - else if (!strcmp("ismv",s->oformat->name)) mov->mode = MODE_ISM; - else if (!strcmp("f4v", s->oformat->name)) mov->mode = MODE_F4V; +#define IS_MODE(muxer, config) (CONFIG_ ## config ## _MUXER && !strcmp(#muxer, s->oformat->name)) + if (IS_MODE(3gp, TGP)) mov->mode = MODE_3GP; + else if (IS_MODE(3g2, TG2)) mov->mode = MODE_3GP|MODE_3G2; + else if (IS_MODE(mov, MOV)) mov->mode = MODE_MOV; + else if (IS_MODE(psp, PSP)) mov->mode = MODE_PSP; + else if (IS_MODE(ipod, IPOD)) mov->mode = MODE_IPOD; + else if (IS_MODE(ismv, ISMV)) mov->mode = MODE_ISM; + else if (IS_MODE(f4v, F4V)) mov->mode = MODE_F4V; +#undef IS_MODE if (mov->flags & FF_MOV_FLAG_DELAY_MOOV) mov->flags |= FF_MOV_FLAG_EMPTY_MOOV;