From patchwork Wed Jun 28 15:42:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Buitenhuis X-Patchwork-Id: 4149 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp3455267vsb; Wed, 28 Jun 2017 08:49:38 -0700 (PDT) X-Received: by 10.223.136.37 with SMTP id d34mr21906079wrd.160.1498664978800; Wed, 28 Jun 2017 08:49:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498664978; cv=none; d=google.com; s=arc-20160816; b=pWocRxS96yYApQXHeLXPIPSKL5P6eAUt5LVRdrtn/t6p5FZdlcqbY4IOfeypSEgyhH 8H7ZDS/V1vDhMaHvjp2vKQ9ojsx6LW5JEu2t0TTNMytowU/M7iDqY3GluVCV5Pa+sOFU 0iCxXhwhoOT20640/Qa5s6iIJk47QBlfxbVkXRoYvLMtm1qEmqpqnEYf1Mmbe20zQfCm +WpzWklP1IJXLGo1L8RpJH0+We9tgd4wIigNyzgn6v7dMLQTUSe66ZOfNXj1XWZ+1gFO SixOwK2QYW61UGtwqNOvX1SaPzLcA8OYFYm2970+ioRP3mIk19RHb9cxKa7Ggv1iLxjD bEzQ== 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=T8J60/J16Qj5Ngfqmzu03XRCSjDiAuFjPhEuTogjkiI=; b=HRk8Rp4mNH21KJIDvFS4P8BRE3kDwuRkFxg/zzNKbsD3dNia6rgi5UTUcgGmTn12J0 uySyAXhqhiPip0nuv+ebZ2jMf68QiBubE2rTLVr11XbEEmJA6G8G7PPg/iIWIwfVtmW3 PwRvl4PmGMFCyVdZFrl4/ojPFwRrP9u/lEaNPdHtMa9wZU51yrk4rnlJVUg/IANfI6TR paYmSAXvPahgfpiI34EbXrdMdlcMqlRmdcsWyEJ6iP7KsXRusWSLESOrvY+Kl8mgpSN1 vw5+avefVfXvaJSunLLScEh2rFPwxcbC+ZDtibs2hpFGi0UDtggiCYjHWed3/NQfET6a H3dg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=UMos+Z0U; 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 n11si5408517wmf.184.2017.06.28.08.49.37; Wed, 28 Jun 2017 08:49:38 -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.b=UMos+Z0U; 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 D185B68A2CC; Wed, 28 Jun 2017 18:49:33 +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 641FC6809F5 for ; Wed, 28 Jun 2017 18:49:27 +0300 (EEST) Received: by mail-wm0-f66.google.com with SMTP id 131so12263331wmq.2 for ; Wed, 28 Jun 2017 08:49:29 -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=4u6I7zr7uyZPFikRqEkx++lrpLuA/nf9UxzhhZJerME=; b=UMos+Z0UuFY5K53olNmYpxin8g2Vu0VVbMXKt1NITTWKrDVQ1ELuSGnglbntNoEmiL nr2PHQLz0VVKiiwrdc/qr/FTr1zINWbw6b+XBj2LpZWwQn9ywn9XUvhNkPvHhtWJh1Rb oJfcuNsvm2Nu8EAQnpEfAq5GfKnJrb6AW6VKrlWyrX6Tmlqg4ut88Ez4ZrqAkwCmS3dU vvlpfedR2gIyM6WIRYrx4lamvtPaX49+ue2SFnuLTm1l4+3PqIcOrSBGg7I8NUNRltgi mxuy8Il8PTxBVg4oJcU2yBXviHk/i5ELXHFKug4bvyxfx7IRD/dBlwM084x0Pmzg/Jge 6BDQ== 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=4u6I7zr7uyZPFikRqEkx++lrpLuA/nf9UxzhhZJerME=; b=hvQBw5wJwAqx1w3f0qnWYqb+xBHMfcseuJZZUvY8DD67K0KXJrTXWOhAptNCGJn2dE KqCFySZnXeBAn6XVn8fhdZzl7toLi4N9G9AOrkXrb62Dxj4WN7JWqd5j0VwFzvWr5zqV fu99T3zxV8arcCKuDqUyZkCfae512U+iaWhpp6fbhhqGG8nn3JstqFk8jjGJ7J3itlL8 /QtLz5aQgrs/M5/lP/Kbu+knpOMzwb8k6T1x617lT0aB/IBvcYv5IoX8Cyu4WGNfv/qz 3rS1yaH6gxXNwNfJvmE0AtMHNhN7fZvxtfW26Wuk78Ry9VL9ce0TyfO9NjoMJsN+BrYu Jl3Q== X-Gm-Message-State: AKS2vOz86BqYsTxkOzvclzxTTTFyJU63M0SOnW1MVhAr8HMfP/pQxbEd 15/QrWE6mUEehlcuEHo= X-Received: by 10.80.134.42 with SMTP id o39mr8272083edo.93.1498664563660; Wed, 28 Jun 2017 08:42:43 -0700 (PDT) Received: from vimeo-vm.localdomain ([62.208.38.79]) by smtp.gmail.com with ESMTPSA id y53sm1230538edd.4.2017.06.28.08.42.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Jun 2017 08:42:43 -0700 (PDT) From: Derek Buitenhuis To: ffmpeg-devel@ffmpeg.org Date: Wed, 28 Jun 2017 16:42:02 +0100 Message-Id: <1498664522-44645-6-git-send-email-derek.buitenhuis@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1498664522-44645-1-git-send-email-derek.buitenhuis@gmail.com> References: <1498664522-44645-1-git-send-email-derek.buitenhuis@gmail.com> Subject: [FFmpeg-devel] [PATCH 5/5] movenc: allow alternative hvc1 h.265 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: John Stebbins If AVCodecParameters.codec_tag is 'hvc1' use it instead of 'hev1' for h.265 streams. QuickTime (and other Apple software) requires 'hvc1'. (cherry picked from commit 84ab1cc437fa47a00532f305b9fe15b5b66c8c5e) Signed-off-by: Derek Buitenhuis --- libavformat/movenc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index d802d63..4a978dc 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -6437,6 +6437,7 @@ const AVCodecTag codec_mp4_tags[] = { { AV_CODEC_ID_MPEG4 , MKTAG('m', 'p', '4', 'v') }, { AV_CODEC_ID_H264 , MKTAG('a', 'v', 'c', '1') }, { AV_CODEC_ID_HEVC , MKTAG('h', 'e', 'v', '1') }, + { AV_CODEC_ID_HEVC , MKTAG('h', 'v', 'c', '1') }, { AV_CODEC_ID_MPEG2VIDEO , MKTAG('m', 'p', '4', 'v') }, { AV_CODEC_ID_MPEG1VIDEO , MKTAG('m', 'p', '4', 'v') }, { AV_CODEC_ID_MJPEG , MKTAG('m', 'p', '4', 'v') },