From patchwork Mon Aug 6 22:41:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 9922 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp3796280jad; Mon, 6 Aug 2018 15:48:59 -0700 (PDT) X-Google-Smtp-Source: AA+uWPymuPjBrmJ9chHZx1Ky0aOWtqmwhn3npsNt7latXNZEGq2/T3mKDtX2JVcfkJa8X8RmLbj4 X-Received: by 2002:a1c:1203:: with SMTP id 3-v6mr22868wms.46.1533595739476; Mon, 06 Aug 2018 15:48:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533595739; cv=none; d=google.com; s=arc-20160816; b=Ems6pn7ETyLAuy4QoETCM6RPLCk8uiGdsj221qN7auhSKBnJqN63QfjUEG6mqlnNoQ fgv2auYG3S1RShbIMDCxEQBAE1g+IxuyMQIanvg7y4DNx6TaKbhWq6UKi1Y2o0+50TqI P6rop0//yoidvikYFSAY4USxI0kPPrs9K1wa9oA9gyHskqPdg7BEJc7hv91gqUsHzS13 HDP/9t1EOOe64JD6agB6DBJ2YpnqfuS1mF728XoLh0QZGcrTNtHZoNfZJf5sZD8xP6KR UeuW9ehCvMdSx+GZrdCzkQH1+c5q2h4MP5d5snaN1v7SsIQpms8LMAPwPGSB08X9/3rN JkcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to :arc-authentication-results; bh=PIIhWxUHwLdntJ4+eKycIspOJzYh/+LeYv/QAXDSeLA=; b=efI4i38APn1QhE+t9pusvlWYKEARSmJKvxw008tWOX9gLMRuky0LUUsySjIyI8cbTF cUkxUVqZqMKV2R3PnSCa0MBuKnGHBVBGIkbH39isTSs2ZzYwhNE4pVwzAVpOxyP5CB07 X7OUUQ72UYHlqSblT5qsnPmoqQfLLRRLNeQIgeWnLIZfJQgqF1sP46DjcKTbqL6Knp4n 7yRoVRRE6eak3B+dr4jWusSE7SKC9mVQ9xcLLiV54OkbHz8fgF1kAUTcSQdVZzJCPlR8 bmB09+Nm4EkdugNXDLXTWCoA0fQygEiLS0CcCVBhfiQM2Wmb4jaYNMJAz4vIb9sgdyYu OqsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=hS0EX4Ic; 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 h29-v6si10447755wrb.80.2018.08.06.15.48.58; Mon, 06 Aug 2018 15:48:59 -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=hS0EX4Ic; 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 8F68968A277; Tue, 7 Aug 2018 01:48:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f182.google.com (mail-io0-f182.google.com [209.85.223.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D22BE689BDC for ; Tue, 7 Aug 2018 01:48:29 +0300 (EEST) Received: by mail-io0-f182.google.com with SMTP id r15-v6so12449928ioa.3 for ; Mon, 06 Aug 2018 15:48:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=maoEBgeM2/F6V35fbGWQNDWNyDGpHicDGi2hbDPhAzI=; b=hS0EX4IcGvTrNM+7mgWaoK8OVBJGv4nF7km1pjsXBI7Bf29bwKRrOab1B00J+rxyrJ s+donFxhe8IvjxVasILHop4hV8WH2mN515ey3RtsafLOdGCZKGjbmKhJy/qCJl/V560/ 3tHFyp5ce+w3484qRaIgdD0mU8L59W2syDFiFVKG0OqMPCRHWGXCFsR8ms0aRZRWP1nK k5IOomWGnMTEBjHf0NgC6wp1qtxWF7uuiGluczalMWDeaOfjKEJ0Q6tum+QD/pjc00H6 v3olkPfxHmhqt9fuEXXtyF9FPKcemX2HAIRuj3CpJ1bFooV2OLw3bV5jtjggZKFIFUFR xfyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=maoEBgeM2/F6V35fbGWQNDWNyDGpHicDGi2hbDPhAzI=; b=UWWW50ZJYxgYTQx5bTfOWQUvY+lGURLSf2Sgt3KZX4zWfztbhjsL8XOs7Rlf2woQze ZoCYfy2KsbJlR9/VolFvUAs6Ycxtm1kvoNXUaYPaiyV8+qucmIOvmJpXcQDx8i7RK2k7 4ZZmuEtJZyhKmx6AVYT3d6dOHclZOjGBq3anbp0c0EZmf1Sihhrz9dFViHuSr5M6ZW8P nr3q1z+guI9cF7lS+vrOPxhdoleZqhzOlHhMkNBiSoAlDVOd2PuBIDzFR4F6jI9Fngxz 5KWG9VI/FTuPhtgdlmh1fMZBTAU5uct37gT7h6bu5F3URV8+AULpsfsvVPnQldt9A+wg uhig== X-Gm-Message-State: AOUpUlFZ8/4KGuv35HKx5vyHsEqUSKaKLW8/JLIQd3OsUY/o4Qbv7ijW iLnqOi3sKr9PO7Mh/d+2hOAcbGOonpIlq5xwGk2wsQ== X-Received: by 2002:a6b:ef08:: with SMTP id k8-v6mr16636666ioh.12.1533595289208; Mon, 06 Aug 2018 15:41:29 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a02:7117:0:0:0:0:0 with HTTP; Mon, 6 Aug 2018 15:41:28 -0700 (PDT) From: Carl Eugen Hoyos Date: Tue, 7 Aug 2018 00:41:28 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavf/mov: Force hevc codec_id for code-point hvc1 and hvcC extradata 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" Hi! Attached patch fixes ticket #7347 for me. Please comment, Carl Eugen From 4f2bed32efe641d2fe21899a0b1d724ef225936a Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Tue, 7 Aug 2018 00:33:40 +0200 Subject: [PATCH] lavf/mov: Force HEVC codec_id for code-point dvh1 and an hvcC atom. The mp4 registration authority accepted a code-point for Dolby Vision hevc that was already used as a fourcc for DVCPRO 100. Fixes ticket #7347. --- libavformat/mov.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index 82cd410..6885ef3 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1902,6 +1902,8 @@ static int mov_read_glbl(MOVContext *c, AVIOContext *pb, MOVAtom atom) ret = ff_get_extradata(c->fc, st->codecpar, pb, atom.size); if (ret < 0) return ret; + if (atom.type == MKTAG('h','v','c','C') && st->codecpar->codec_tag == MKTAG('d','v','h','1')) + st->codecpar->codec_id = AV_CODEC_ID_HEVC; return 0; } -- 1.7.10.4