From patchwork Thu Aug 25 15:58:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Buitenhuis X-Patchwork-Id: 293 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp978238vsd; Thu, 25 Aug 2016 08:59:07 -0700 (PDT) X-Received: by 10.194.29.102 with SMTP id j6mr7816955wjh.99.1472140747164; Thu, 25 Aug 2016 08:59:07 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a13si32233226wma.116.2016.08.25.08.59.05; Thu, 25 Aug 2016 08:59:07 -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; dkim=neutral (body hash did not verify) header.i=@gmail.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; dmarc=fail (p=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 517E4689B46; Thu, 25 Aug 2016 18:58:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D80C6689B38 for ; Thu, 25 Aug 2016 18:58:42 +0300 (EEST) Received: by mail-wm0-f66.google.com with SMTP id i138so7990003wmf.3 for ; Thu, 25 Aug 2016 08:58:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=WavWO2v2lCB6Ct+lbwTnfk3eErZaXTSJBYKpJRmULFE=; b=Uvhsasmc0Bb9ANCpn/D1P2uKVaqMz+oDpAQuTFJ15SQNv3qt7Lo4E0uJJ53JKSBOiM KsVGnooc3cutTL5Zd4QT8FJ8B9rMTiLqSksEoI0rV5F1jvuMVngKgxTcKxd7vZFH/ajl odMb3kRTWBcfe8o3umROkBCys1Ef9slieCd1MRRyjU5qfcssY6SVXoR9YIqnSOCsttv0 C2FNsnZt2yjva4zY0D+G1oglFlQdFOX1H/nuNb3DGJbfxB9rpNdceAMBR8/JnJskqaOJ WRTogFuMbsYvExdsl8wV2Zhmr9iEqZwPxQZud+llgGSvRLkH3ZmNCvNppSOT7NPSvLbs O2zQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=WavWO2v2lCB6Ct+lbwTnfk3eErZaXTSJBYKpJRmULFE=; b=cFCccOWbsqOfBV1VU1h2L5CqIWKcDQwgxGZWrlBS52C4uGYDNPsrg6qu3nD6ooDyzk 9D9tVv1WaoIiklmZIXsf+NLm0TKzNosYa564XSaaGfyQZVpnV6fKKLHs3W6LXCPR6aEM fEtJG38oGcgZpiW2p7edTC36tzGBK5o91ofB//KWdkhqsnRu2X25cJPiMbYg9zOQqZco m4YZIWchIteuMzxqw+kIeg2yH7dMe36J8Nqi/a7dAyMZ7+gaLi7xmC1e1JzkXyZPrrwg agRnuRJnt8Qa+NdOY7AIBWmvK7A1jlraR7HSzhIbN860OfWyJj0kbckUgqcssjsLXwNy /hcw== X-Gm-Message-State: AE9vXwOwXH8VkvuWkO9BvY+GO1O6hGSnbvxOzI81nDxvR2Nvie9H1tZQCyKDsENBymBt8g== X-Received: by 10.28.70.5 with SMTP id t5mr7813948wma.46.1472140725383; Thu, 25 Aug 2016 08:58:45 -0700 (PDT) Received: from vimeo-vm.localdomain ([62.208.37.196]) by smtp.gmail.com with ESMTPSA id ly9sm15729494wjb.44.2016.08.25.08.58.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Aug 2016 08:58:44 -0700 (PDT) From: Derek Buitenhuis To: ffmpeg-devel@ffmpeg.org Date: Thu, 25 Aug 2016 16:58:15 +0100 Message-Id: <1472140695-10290-2-git-send-email-derek.buitenhuis@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1472140695-10290-1-git-send-email-derek.buitenhuis@gmail.com> References: <1472140695-10290-1-git-send-email-derek.buitenhuis@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2 v2] mov: Remove old b-frame/video delay heuristic 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: derek.buitenhuis@gmail.com MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This was added before edts support existed, and is no longer valid. Signed-off-by: Derek Buitenhuis --- libavformat/mov.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 54c63ad..bc11fb8 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2801,9 +2801,6 @@ static void mov_build_index(MOVContext *mov, AVStream *st) empty_duration = av_rescale(empty_duration, sc->time_scale, mov->time_scale); sc->time_offset = start_time - empty_duration; current_dts = -sc->time_offset; - if (sc->ctts_count>0 && sc->stts_count>0 && - sc->ctts_data[0].duration / FFMAX(sc->stts_data[0].duration, 1) > 16) - st->codecpar->video_delay = 1; } if (!unsupported && st->codecpar->codec_id == AV_CODEC_ID_AAC && start_time > 0)