From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 6FC7345B4C for ; Thu, 20 Apr 2023 14:37:19 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A61D868BE58; Thu, 20 Apr 2023 17:37:16 +0300 (EEST) Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2630068BE1B for ; Thu, 20 Apr 2023 17:37:10 +0300 (EEST) Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-2f7a7f9667bso419774f8f.1 for ; Thu, 20 Apr 2023 07:37:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682001429; x=1684593429; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=JlPLPUm5biZBAtzW1MKnVnXSoVyZXlLWNAQu9tN5wUs=; b=oO97Rlf/I69MxcLNSP1MuTkwAvzBkTctEFzIqw0RVta9vGv4MNF3PQ/QOMK0FXdRrd FCdpISFJcKu4iKgI1DPkSp6n9BqgOAUwStwJYjcd7QcGs8afCTyG3MwoyD/1mKds6hpG uKVj0o21T4hUM8H7WO384DL89Q1c1mcBAKm6QTDIb0lJbe8gsPdMM2J8LoMWM4yArev8 SC/lOk4O5DD3Qs6JQNFLg+x7eION8QmjdQ6OQaQJXBEaDWDv7qCWNxsBsdQrnOm1Mh4Q yOHL5EnbaQB7eWyNNPqjFAycJ8MhELHUqYCLxEEiq1Pxndv85/OvX5Wd5KWOvBuLbnDF mwKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682001429; x=1684593429; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=JlPLPUm5biZBAtzW1MKnVnXSoVyZXlLWNAQu9tN5wUs=; b=Du3oytPXWgaMxrqBOKTkOvNr5xyUlMZwqUeK6cR3I+WmmOHLhw4dxBQhyBokQg08fp pimRu74StyZ/Gy3rua4a/4dF5nWuJE8rPTKhQ0tpikGl6OLoeSlMJEsdHq66L4BQ0TuN GYDkqrvPHa6o9yF/nBU2mAp4hzN8C4KsOGZCxpz3NKo3xiAU9bqcZBON1enDA80OwImb gd+3RAm3MWYAghNOEoC6y5foo6Vu8blTy8c/alSFXW3EaeKG45YRLMdxLsm6l07FBNXT 2k1aTOvkXWb7AVoF+kOQf0+Pl6s1HabCBskMtcbWVFXXyZav4FkIfyrb9t1mzz7bNdsN F6yA== X-Gm-Message-State: AAQBX9eRu+OnZxu9mChvRoI8uGAItihWCx18czAeW9u60r+zri6oPrn4 kav9KY5OoPEPiEF2xbD+icDXomRpo8M= X-Google-Smtp-Source: AKy350aBD6kmJHxN9jy88y/e+KvbkNQtfusW9EV8IzkNFxzlhWbiMynmvNHdX+VuKP2ejCRUkdzPXA== X-Received: by 2002:a5d:5389:0:b0:2fa:1c3b:ca51 with SMTP id d9-20020a5d5389000000b002fa1c3bca51mr1501584wrv.71.1682001428734; Thu, 20 Apr 2023 07:37:08 -0700 (PDT) Received: from localhost.localdomain (33bf137a.skybroadband.com. [51.191.19.122]) by smtp.gmail.com with ESMTPSA id b1-20020a5d45c1000000b002fdeafcb132sm2077656wrs.107.2023.04.20.07.37.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Apr 2023 07:37:08 -0700 (PDT) From: Derek Buitenhuis To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Apr 2023 15:36:56 +0100 Message-Id: <20230420143656.421028-1-derek.buitenhuis@gmail.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] mov: Do not blindly disable advanced edit lists if use_mfra_for is set X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: This was a bug/mistake in dae3679a9bfa421829ef9049ae2167089a2fdef7. use_mfra_for by defintion only has an effect on fragmented MP4 files, making the check not only redundant, but also broken if a user used the option globally (i.e. set on non-fragmented MP4s). Signed-off-by: Derek Buitenhuis --- libavformat/mov.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 057fd872b1..4f38f7cb78 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4655,12 +4655,8 @@ static int mov_read_trak(MOVContext *c, AVIOContext *pb, MOVAtom atom) * Advanced edit list support does not work with fragemented MP4s, which * have stsc, stsz, stco, and stts with zero entries in the moov atom. * In these files, trun atoms may be streamed in. - * - * It cannot be used with use_mfra_for = {pts,dts} either, as the index - * is not complete, but filled in as more trun atoms are read, as well. */ - if (!sc->stts_count || c->use_mfra_for != FF_MOV_FLAG_MFRA_AUTO && - c->advanced_editlist) { + if (!sc->stts_count && c->advanced_editlist) { av_log(c->fc, AV_LOG_VERBOSE, "advanced_editlist does not work with fragmented " "MP4. disabling.\n"); -- 2.39.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".