From patchwork Mon Sep 24 00:57:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 10465 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:1286:0:0:0:0:0 with SMTP id 6-v6csp1953164jap; Sun, 23 Sep 2018 17:57:46 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYI4RTEjXmlETpgVryf1NShyBJpYsuk5uvkq4EWiaVWZ21GvWElP/PPIwT2TaO1pPm19W5/ X-Received: by 2002:a7b:c1cd:: with SMTP id a13-v6mr3121826wmj.35.1537750666369; Sun, 23 Sep 2018 17:57:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537750666; cv=none; d=google.com; s=arc-20160816; b=xWW2GGhtNEjGAvPFHq0kA20DdRKqDjSvJAwzqNV0fDqbkuJ7gOEXnI97SYqPFcxXWk eze+0QeeId/2AWyvqyl/cruBriYc4VCEP0HyB6cHad0sSflTADxOsSP9cSsv3aSSdl4G g7N1TvScwXO/yKYjhFaZpDXMs4Tnbl8vckmSbJSXk0+9GfGku9qfZwUfy6yhzI9SRRBP du55Y4cP6vPb2MhKcs7WQeQPOPilIbsf11owo9bjGnXd9lXFdrnH4zIvcC2U8nO9BvTS gJsdRH10g9spHbog+xAoEBF7Cn4X/GG8bu0QoxODHGsUe52mGKnhiGwSLmJ8GY0amUp3 oJNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=2jr6V1cDZbX78N6qMX6J7EmkcUsP2RLY1xmZQwjsrwU=; b=XCqG0MrrrtDSJ5xXrsXMjZNZ6cFnAflCEHGXh7gxdP9jHLbgV3jTSxxm0P7r3AaxqM kYviszpe7Y9kkKuCLZTNK4TRV8aKMkd8GeD7u3iBhQfp1FnEwQEmK4wrIP9u7QSTu/Dm UhA7qlczc8n6LSOnnIAwq1osbpYyFTa6u2pPgDRkfgOJBaJO2/OAnUKpbDZzhawWoeaX Z5+CUYiL/k0k6JbEMdO39rNSe59vDFiuwaPsvKB2Lv5UfyrDwAVuUmpkp1Aluxc1E/v2 xnZUms+521e2gPbSgnp2MZCdlw8D1Nmyt0QOk7RN6N24xpzgZ4IcazkxJUmrZergX+Bs jviA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=glGT6vAE; 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=QUARANTINE 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 y14-v6si4274447wrm.238.2018.09.23.17.57.45; Sun, 23 Sep 2018 17:57:46 -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=glGT6vAE; 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=QUARANTINE 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 3E95968A587; Mon, 24 Sep 2018 03:57:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f195.google.com (mail-qt1-f195.google.com [209.85.160.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 21E8E68A0AF for ; Mon, 24 Sep 2018 03:57:21 +0300 (EEST) Received: by mail-qt1-f195.google.com with SMTP id t5-v6so7595732qtn.3 for ; Sun, 23 Sep 2018 17:57:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=hZ7c2EVU+6Sr1Be9iy13UHpDF5rkBb0jxjvj5kTeCLQ=; b=glGT6vAElIOrXMTRooe5iE8MYssA2RRRpu8hSOcJjXER+2uvfjBZWN6OgbgeYYoaCA 0ggiIQBU2z0FlQ9N4BqObteaRDdfrO3jRJIykgsAycXEvwqo+E+snMz9EbtkMob0iCCl nllYeBZztHUboN3rInXSHYqnACJzFmpR5aY4l2ErEsq03abHkrEj8xXZnGJf9snwSvII 6eFpowR25CSZHtvhdo2cB6r287sHpa/oujpb2Ju0Poie9VjWkftC7XvbOAiJo2wxIhIo MSmw5Ce20XHSmYLwNF4ovY1pTjk/Sb1uEtb3Ie8uJ4Oo2S3MEhRhOS2oipKinS+DEAUt uenA== 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:mime-version :content-transfer-encoding; bh=hZ7c2EVU+6Sr1Be9iy13UHpDF5rkBb0jxjvj5kTeCLQ=; b=kP+q7kmdvPPKJIounmnlP6yoo/eYddXfLnY9ivqCK76AwvI8K/p0D43oI8zvLfOolG l1m3o0jadxqKG3018yQ39jAGMPMG+pVic3sUC8Swxc7MaBy26VoXmHwaZQS7OHBww15b oTzbBRimxCIn2cUgWU7raO5Aq8PWlMoUMqCauNEb4zFMKsTdGHrFmyOc9fxnHfyGPaUL cNXwIOzHfxvuqlmV0K71n0Ip68c0MS33wi4YiBK0mzrslb9uGz07r2HBWNJS64LTAzQX wjcZloFh7wqFPaVAF+lGmN7EMjhu74dFuI8dGyBMy4/vxmCx2lwFgisrtmeimifiMw6i jbIA== X-Gm-Message-State: APzg51AFSj74a4jgm06m12d0eulLb/FQgnZj158mj+iZbS2wIJJfdThO SW4BlDno2E4DDUH6wTAP/h94lcfC X-Received: by 2002:ac8:427:: with SMTP id v39-v6mr6034624qtg.59.1537750655284; Sun, 23 Sep 2018 17:57:35 -0700 (PDT) Received: from localhost.localdomain ([179.38.139.56]) by smtp.gmail.com with ESMTPSA id s15-v6sm4346389qtq.76.2018.09.23.17.57.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Sep 2018 17:57:34 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 23 Sep 2018 21:57:11 -0300 Message-Id: <20180924005711.10144-1-jamrial@gmail.com> X-Mailer: git-send-email 2.19.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/ivfenc: fix writing codec tag 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The value in AVCodecParameters->codec_tag may not be correct for IVF, as it's the case when remuxing AV1 streams from mp4, so ignore it and write the correct value based on codec ID instead. Signed-off-by: James Almer --- libavformat/ivfenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/ivfenc.c b/libavformat/ivfenc.c index af803d59ee..66441a2a43 100644 --- a/libavformat/ivfenc.c +++ b/libavformat/ivfenc.c @@ -46,7 +46,7 @@ static int ivf_write_header(AVFormatContext *s) avio_write(pb, "DKIF", 4); avio_wl16(pb, 0); // version avio_wl16(pb, 32); // header length - avio_wl32(pb, par->codec_tag ? par->codec_tag : + avio_wl32(pb, par->codec_id == AV_CODEC_ID_VP9 ? AV_RL32("VP90") : par->codec_id == AV_CODEC_ID_VP8 ? AV_RL32("VP80") : AV_RL32("AV01")); avio_wl16(pb, par->width);