From patchwork Wed Jun 28 15:42:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Buitenhuis X-Patchwork-Id: 4151 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp3455531vsb; Wed, 28 Jun 2017 08:49:55 -0700 (PDT) X-Received: by 10.28.16.17 with SMTP id 17mr7791891wmq.1.1498664995360; Wed, 28 Jun 2017 08:49:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498664995; cv=none; d=google.com; s=arc-20160816; b=p2+BtsNOohJL3s2r8Y5z76N2jVQLkIG49ueC1F7a1NkXpk6NYwSB3jIazQW2JKJ9Ny YG9VTharhDz2g6bLNcC4ejENc5IXaJ2tmaoRK3mZrqm8ULyvW9BsHLMJGIbbo2wmvUnW edrFfVy40OegsIz7wyIA33FtmMjFL/dxXGN4hKCxtCQpEjt/rvbctnrjYTrKrRT4PWE+ oU93Hyk+rAQDvW/oEYxS4M0SJLv4Q5E6KgO7Cr3VyHJtz+50wR34iZr6bGc7x4yRQmHC sxaA8Jau2TmBit+RMQwLPXpGoaIgTecyJXn3VyhN97S6xmskVMxLG2WWzSPALbKEwOyU UyaQ== 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=Nw2E7TYEF7QDNKkx1rTLTSALi7vARxrsZHY0TKoYfSk=; b=ZNW9aAKV7pR6auBwLEFu9MmuRY0I1G8Bcxl7h1J5qwVibgkC07VeuHkwECevDtDD23 /FrNGry8ZAYeRuD+PpCT5UytEfRiqSdg4u4sP4Y34cXh4jrRuuvMcNkXqhhHTlXSzIBc j8m/RRBXrusQB3+9jkCdo0As8MP/SzToRHdwzbNPUOr+hEZcP0680CZn4YxcJyRXcXhh AYCJN6ERIuxHIPeGEoU3uotBxd8vZ9gdkgvnfQOgGh5JVD7WYsluQqYE3yQsd2xo7Nyw x3xg0PGSjXZaPJcO5liZtFKmFcj194P5398Pf9G/JX7bBzR6eg7rbrDffThif34FpQa3 x44A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=rwoRqYsC; 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 e12si2008886wra.216.2017.06.28.08.49.54; Wed, 28 Jun 2017 08:49:55 -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=rwoRqYsC; 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 86BA868A50D; Wed, 28 Jun 2017 18:49:44 +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 593EF68A262 for ; Wed, 28 Jun 2017 18:49:37 +0300 (EEST) Received: by mail-wm0-f66.google.com with SMTP id p204so7460645wmg.1 for ; Wed, 28 Jun 2017 08:49:39 -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=0eP8z09tEobP8dkSPJUy4mBLC2WF/7vZeB8xpiHAVG8=; b=rwoRqYsCvWVYVLq26Ala31lQPzwsD2hlr7AoWdIfqaITFaC0f3qGPxkruIoqp33y2P YBgtwIjFmvRT6ZdkRdxEhlE5mNNp8gGcz3FRU2/5CpXybEe8lWxKgUVNyhCAxVXCsuS/ RqAkX4ziDKbr/eNqtqORp7wJzAmID2FQWXXrcPsufsXgLhFLiG/2fVcn13EUo6cz3F7D wlZJ1DQqNcwLcMb+TR2WiAKI1DGJRn1cdgzljGO84CXC3k/oCOKvwPMoQNSS7NR1AWKu iaqDxacujBbHPWYGhsH4M6DgPmnsBLyi5i34Mt4crIC/fyTdHtpPZjQgauZjQFgsQleY mw1Q== 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=0eP8z09tEobP8dkSPJUy4mBLC2WF/7vZeB8xpiHAVG8=; b=eRobSmvX5gcKmzyhJa9WKkHAk+xHG0pPpXmaIqLE/KnI/yDX9kXIw3Xs+0J/1Nf2QY MMu/+kP9q8GIuH/JlGasPb5Uk+qBNvchf2V5ucuCOKNBMPCfF+DpJPYSmJZN1jFNJZTo xSCIsJp+omAKNdpMNTiQoVkhqCOaQwmKNo3XND3r4fFQ0JGwhuiga7SAR8utl/FohJWw uHqFAvaXjUl/25hxJZQ809+wbg6rS6SZm0Le3V6vskPWCClipwyIbYoJ10PuTtO0vJoR +hOLB99tcJZfyunUEJLWoOmBFOILWecCjgQMYNKqOatvHUyTFN2bAadZbvP0s3fOLcN0 Q1rg== X-Gm-Message-State: AKS2vOzlZVyRipxFzBlxUL6y3lrcYDmxI/6RzAkSr00Cq8E1EKtlwuD3 I82apkAUPWPJ2eWz2FM= X-Received: by 10.80.154.129 with SMTP id p1mr8225168edb.131.1498664562832; Wed, 28 Jun 2017 08:42:42 -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.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Jun 2017 08:42:42 -0700 (PDT) From: Derek Buitenhuis To: ffmpeg-devel@ffmpeg.org Date: Wed, 28 Jun 2017 16:42:01 +0100 Message-Id: <1498664522-44645-5-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 4/5] movenc: write correct format hvcc when tag is hvc1 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 (cherry picked from commit 1ea9b7fdf99b60c0db95a2ce97b2108469bbb245) Signed-off-by: Derek Buitenhuis --- libavformat/movenc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index cc6d61d..d802d63 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1126,7 +1126,10 @@ static int mov_write_hvcc_tag(AVIOContext *pb, MOVTrack *track) avio_wb32(pb, 0); ffio_wfourcc(pb, "hvcC"); - ff_isom_write_hvcc(pb, track->vos_data, track->vos_len, 0); + if (track->tag == MKTAG('h','v','c','1')) + ff_isom_write_hvcc(pb, track->vos_data, track->vos_len, 1); + else + ff_isom_write_hvcc(pb, track->vos_data, track->vos_len, 0); return update_size(pb, pos); }