From patchwork Wed Feb 24 11:53:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25951 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 8303B44B3F6 for ; Wed, 24 Feb 2021 13:53:57 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 190EB68A0FC; Wed, 24 Feb 2021 13:53:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ABE8A6807F6 for ; Wed, 24 Feb 2021 13:53:50 +0200 (EET) Received: by mail-wm1-f47.google.com with SMTP id w7so1542603wmb.5 for ; Wed, 24 Feb 2021 03:53:50 -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:mime-version :content-transfer-encoding; bh=KgRPvPIN2TzdCKX9Zko9STHdxP2A1jEsTHyjOFACqBY=; b=HQO92pI8MFxtzBUsX1fhiy00nMwDuombYYJOKJHQZ/RE3ewJ11M2pN/u6q7wSpFdwT mt8+yilU9ZUen8COjmA2me+ll0s+U/qr5mkSYqNOV+YnxCX3uwoQC+4wojioG+YA81qg HrtJfcmySkN5Zx/Somno1Ny1jurs/pf5LCMePKT+yJ3W2X0oIwMix+Eqqh0k22ru8pMV NnTN+Pz1u3YbE1dp+ItAPw1+l6/HKMwxJzZ5fXGJwkdx1vh06+cq6li3T0uo7OBdhXFZ AyTpIE2zYUH7SMyJffGFlqF37R/mGvMyXZIW8rkco3QsA0ZYZMiBpybxpSDpNPt7RfsW MukA== 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:mime-version :content-transfer-encoding; bh=KgRPvPIN2TzdCKX9Zko9STHdxP2A1jEsTHyjOFACqBY=; b=jLpzn5eXO8okJOSGPDhzacHG0+RkYnWqx/8JGqqzn35+HcXoCSvz99OrebC1pg1OcW u9p0QXnT3llo0ZuZ8qXt9tPqaU3noGkhc8CBmQBzKchTLW+K+s2hlHZ83FxmsLFaAywl VhK08NewHn8vAsf277P1OC8XC0wUZEKzSAr6exQ4o75i/9WNHK64OP/HdfbvCHA7DMgN nh+2s/cmSYC7zhMgrkm5Gh5jfWZ56o6vLo+LM6KoeNKlA3L0TJLoV7ZaVl99wCgh+w6O AkNbTtVhYnh/9ofaruQNdmlaLjt5sGf+1yX7N72ECW9HEGckSnpMoMd6jWLYbVyF/9EB 5dWQ== X-Gm-Message-State: AOAM530zAMPPTmdAjdajjydLJHXVl1twYd/JQ2ZOqwgcOJliirEFNYY1 hlN2QUi8rs5gJ45hjgnAfWTFaAyXLsw= X-Google-Smtp-Source: ABdhPJyG9ZIozQg0PjvH1hUduTvq00w6bDeZC73K3le4AMuBNJkfEEt2I3TkluY/zmXcn/0GmpGVsQ== X-Received: by 2002:a1c:cc04:: with SMTP id h4mr3396010wmb.142.1614167629849; Wed, 24 Feb 2021 03:53:49 -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.53.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Feb 2021 03:53:49 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Feb 2021 12:53:27 +0100 Message-Id: <20210224115341.794293-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 01/15] avformat/movenc: Remove always true check 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 --- libavformat/movenc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 545b0885ae..cdfcbd3d76 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -6395,7 +6395,6 @@ static int mov_init(AVFormatContext *s) /* Default mode == MP4 */ mov->mode = MODE_MP4; - if (s->oformat) { 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; @@ -6403,7 +6402,6 @@ static int mov_init(AVFormatContext *s) 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; - } if (mov->flags & FF_MOV_FLAG_DELAY_MOOV) mov->flags |= FF_MOV_FLAG_EMPTY_MOOV;