From patchwork Tue Sep 26 19:55:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 5300 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp4217299jaa; Tue, 26 Sep 2017 12:55:26 -0700 (PDT) X-Received: by 10.28.95.9 with SMTP id t9mr3647742wmb.109.1506455726053; Tue, 26 Sep 2017 12:55:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506455726; cv=none; d=google.com; s=arc-20160816; b=k97nEeO29EvhQFiZHikFoWngLkGO9joXHHHPgAMXDkAJKplUIo6u1MoFOePZSMKsUN jA2KHiEdNdFKDpGg6umhvGxhWqsM4NlvMtOHOpI2WsVo4+0sXo5HEp3dHI2muuv3jU2e tVQ3TPUKXdeCfIxJS4XXJt6MUbQwB+8YicaDxJIfyGRJOOK5WVRvnzuADc9OFJ6OB5Co WeRR2a0nTACIeg+26yvaums1S2QlvCSbG5uzJf8IpurTIzjnOkiFgIy68xdQ3s8MC2Xm GUfD0D7PnMUPQmypg0rU90Texfvoi9ifUpK0gXNmkK+RhDRggkpVjt64KYOd/L/jnWab 8KSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=GYtRcwGbL5US+5u24JjYwL2Jeewna+GHsBIyyJ277Wo=; b=A2Z0aUWzFhwp5bM6ESUwByOY1PZ+TejFMy7cXsQFyIFySBX6GGedj+3bFZKiumkTr+ S0v/r36qqU7GJ5rg346r3//2u9qAuRIAOOA9eIvjIAtAoplFJu7vi+ZB8fLAcOSbyX6V AN73vewlAn4ok7SJKcSZB2FZVXEqgIX8a/EVBbfGWrxSzUFweYujUqktoPiwmbY/LC8h cpVwtosezO3Z8EfwfOhjD4iOLmaoSGBxXqMVi0hv4qJdyRZSNQRdWxUN+ijqbYrUIPOB Nvzw7zwWvzmHoXr6WRc59csFgWC4O6hFi60EzuaNN9mCnIiRu32d+qEasFIPwbmYUAC+ dmVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=WxYCjiuy; 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 sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s14si8164132wrc.551.2017.09.26.12.55.25; Tue, 26 Sep 2017 12:55:26 -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 header.s=20161025 header.b=WxYCjiuy; 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 sp=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 870DC687EEF; Tue, 26 Sep 2017 22:55:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f65.google.com (mail-it0-f65.google.com [209.85.214.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DC5916805BF for ; Tue, 26 Sep 2017 22:54:54 +0300 (EEST) Received: by mail-it0-f65.google.com with SMTP id e134so5183790ite.3 for ; Tue, 26 Sep 2017 12:55:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=PKag6WNdrvaAhqhIngUE5aPS//8IAzi/I3JiUIsOVww=; b=WxYCjiuyRFBS0gO6knH0Sls3delZ244UuTHc76NGnMMLJ7sRMgQdxLSJ0XPl9z0shF xDbZ8s6eZYjy1ejLvtTUeIg9VSPgnKm/mA6VaDCKE03GaWNTNxyABAZeBPIw2GrTr4Xu gYSmyBPd3O2hVnIyK0bM8PI0cbltN+nFKrge6N8Uu+ujObTePZul5p7tVJSJeUBDgUjw jxvoKEh0lnD9X2r8VxVlB/cNiaUcfGv0RZ9RSxyhAjgTjI8Z8YlCoGrJqWs57oeUqDjh QFSJAGoW6tmo6KxChEC+ydH1e5NNKldRXStTUN1UIP16bIeBNoQP4h8zODKjR03ycy9x 9JCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=PKag6WNdrvaAhqhIngUE5aPS//8IAzi/I3JiUIsOVww=; b=n9J0xC3ayxxEi0Ap6fafyobPyz/tN9RAJqMpTn2igAoc/7My7E7+Y7xOLqYoeCNtfz udnFidp1jZBqteWkhu01wxzPDo8EbML6TIZtqeuu3orDBCZWOa40nW7L50ehHYzhGa2j DosmtGsAKKhfPsAKCu1A3fXdHVohZufygADW4RDSWUhSEW4m7Tyv70LrPrAC+E3bxPfh 0BdxyMCG30spKVuU5JKUW5obD4yhErUggEMpW8AxnbrYZlhO5mXDqSheVLOnoKZVxqTQ SrFAs4Qxln3aXho8IVCnnfVCYspc5g/hUI7pKTi3DnrnX7Zko/pCo8SK9WEBdcwsS6rU JeEQ== X-Gm-Message-State: AHPjjUimhRAIhmzDVHAQjlwPiQqilvHGkje4u898xK0ec4qUPOUmxi2k Slet+vhhXCHKfV09Y9LCcLxEFilt X-Google-Smtp-Source: AOwi7QC0fYGf81N+bbOmz0UvJo74UqhMiqQDVsuAVnq/2lLW4Bzv1kEYXVm3oj6FYRu71ZWqN1wBvg== X-Received: by 10.36.92.10 with SMTP id q10mr1538456itb.145.1506455705735; Tue, 26 Sep 2017 12:55:05 -0700 (PDT) Received: from Rodgers-MacBook-Pro.local.net (c-73-75-100-12.hsd1.il.comcast.net. [73.75.100.12]) by smtp.gmail.com with ESMTPSA id t70sm4568914ioi.80.2017.09.26.12.55.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 26 Sep 2017 12:55:05 -0700 (PDT) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Tue, 26 Sep 2017 14:55:00 -0500 Message-Id: <20170926195500.88129-3-rodger.combs@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170926195500.88129-1-rodger.combs@gmail.com> References: <20170926195500.88129-1-rodger.combs@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/3] lavf/dashenc: unset codec_tag when it doesn't match the underlying muxer 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/dashenc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 7ed48905f5..3a4b6478d1 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -763,6 +763,11 @@ static int dash_init(AVFormatContext *s) ctx->avoid_negative_ts = s->avoid_negative_ts; ctx->flags = s->flags; + if (ctx->oformat->codec_tag && + av_codec_get_id (ctx->oformat->codec_tag, st->codecpar->codec_tag) != st->codecpar->codec_id && + av_codec_get_tag(ctx->oformat->codec_tag, st->codecpar->codec_id) != 0) + st->codecpar->codec_tag = 0; + if ((ret = avio_open_dyn_buf(&ctx->pb)) < 0) return ret;