From patchwork Wed Aug 31 11:35:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: erkki.seppala.ext@nokia.com X-Patchwork-Id: 353 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp327739vsd; Wed, 31 Aug 2016 04:36:49 -0700 (PDT) X-Received: by 10.28.86.8 with SMTP id k8mr9452172wmb.33.1472643404699; Wed, 31 Aug 2016 04:36:44 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id af3si3517485wjc.94.2016.08.31.04.36.42; Wed, 31 Aug 2016 04:36:44 -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=@nokia.onmicrosoft.com; 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 dis=NONE) header.from=nokia.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 45EB86898D1; Wed, 31 Aug 2016 14:36:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-eopbgr10127.outbound.protection.outlook.com [40.107.1.127]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 20F77689A5D for ; Wed, 31 Aug 2016 14:36:01 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nokia.onmicrosoft.com; s=selector1-nokia-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=Z7DpoEsgcaVKBKf6fhA+BOCRTqY15Z0DWcq9X2GqgLE=; b=ej8XzUeQpJq7VSo7atUe9P2pOPR/93+Oe8RMQEC2TUCh5XEeXvHbIkP//cpoA0RlHDH5294HxaXzvHlYACKzCT+NrGAf020eusYp2MesxPCkT7YLZC5+2/I5bs+1iqSWWTCO3aRcubUiiDqHbxzgK0NQLO/NNurG0yku+5FGwho= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=erkki.seppala.ext@nokia.com; Received: from erkkise-laptop.vincit.intranet (131.228.2.27) by DB6PR0701MB2535.eurprd07.prod.outlook.com (10.168.76.23) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.599.9; Wed, 31 Aug 2016 11:36:04 +0000 Received: by erkkise-laptop.vincit.intranet (Postfix, from userid 1000) id BF7B44CB942; Wed, 31 Aug 2016 14:36:01 +0300 (EEST) From: =?UTF-8?q?Erkki=20Sepp=C3=A4l=C3=A4?= To: Date: Wed, 31 Aug 2016 14:35:45 +0300 Message-ID: <1472643361-10118-3-git-send-email-erkki.seppala.ext@nokia.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1472643361-10118-1-git-send-email-erkki.seppala.ext@nokia.com> References: <1471943019-14136-1-git-send-email-erkki.seppala.ext@nokia.com> MIME-Version: 1.0 X-Originating-IP: [131.228.2.27] X-ClientProxiedBy: DB5PR10CA0006.EURPRD10.PROD.OUTLOOK.COM (10.165.4.144) To DB6PR0701MB2535.eurprd07.prod.outlook.com (10.168.76.23) X-MS-Office365-Filtering-Correlation-Id: 1e63a2a4-4337-47af-da0a-08d3d192fe1f X-Microsoft-Exchange-Diagnostics: 1; DB6PR0701MB2535; 2:nya4gaIY75xYXQcovJBgldW0qfQbQxSs9rcvFsvhtSAPqiZpSpoSWtBXx7/anWhwgsjMjBo21dLBFgNPICr9VHt3u2bxO6lz+zKV2Bh8ccGMDYac2PVR0NozHE5rkgMkO9sXrBLrsQGItlbHWNfOdvvbZVsYIKzJKcqqzcqJHP22UXskyLS3vTCNHH08Qci4; 3:XKQ1FhHqZQlsu8OPalm2O0DgjXGDDljEpg4rqX3ZXMvyAe/7WKXOLC7iumyy1Nfk8sC2VhLIlu4AqAUpBKfVjQhYH/pOOtkivCwDEE6ICwWD9Yzu7IRvq5ET3AQnll1W; 25:8hIfS/P3ZqtRv724iIeoQyiRj5lFAPDVhYWdDhOhH29oGCptQm1jsWFhpyh0ZMzG3rszxpWhBvkiVzdwbCBU8h3V4VbJATGv3W5uBCqr5fLrezbu6HSU1iQwBzq15WX29lCj5slL/rZmOokbac7oSwOdXt2vGfefGrJ6wtjJP4BZ9h/X0V+jAx7wAxeGGkWq2etCDrKWnhyUpMsr+nzs6ZDIbE9TryIuV/bD4EL2vZt0j7XN8qBoyu4vaSqqjLQhNe/P/D6eSFS9gBIAOOqha/owSA6y1ROqmDCVINcBsRySzghn7a8luBRh8K972+3UHxM8EGQMDMyXL9gjxJcIhInuEK2PbM4N5QC110LrhyMg2lE/Xx4bhvan6GS61j1FpfaXSV1WM3n94AASd6dLE9VpjDfz20bLyfZK1mHAKXc= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DB6PR0701MB2535; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0701MB2535; 31:MjR9hIlh+0U4AF3t+Nt9cI9FZpftaJWhYoTmqZHsI8OzvQZPR7gLSBCNIGr8aER5GG8kt8oM9YFgALNA1+aPEie/CdoQsdT8D2VaW99p+b89NOik/PLAVRChWdsFer1lvNgBDIe2RRgwhkU8eSfkgnaLTvG0OKu+5+4C8NbIyccYUVIPq/89iogha/eQSIVm/t/OfYJ38R/U6mjCw6y4k7U4Jd8XpEUT3IJ+G5v8X7E=; 20:4iNtV+0rclrahfrsATETkEaBBijpsai4ixmzCNP+dauM3O03SXo05mIpRM2SOraQnuWxk/FHPUmEKswXnhcgz2shDvntmtebankGwR43cilMCRaN1XIxW1/qDIDuhiTyKZlEcVLoMF/bus701oswpYUtOND4Y/NUk/hZlrR0UKVCi5PuWMw8ZPa+LlJGbVOVFeFWouRGf3bq5P6agu1HIsQQVEuzMJpIjr7gV8VjJaqy4GXFFu3gtXpreSeaQVwybctgr3PFR47fVxEIJsvPnhCbPQwVic/59IEEQudqgkHs/IR1ZR/VlsFllPUnp7M9e1LNlKYCICaxA/nmMYkdIuv73YRUr/+n2eefPuY0Zxtp5FER0WTvQxk1W16/jsjrHWOc9OnUGAnmcKSg1hNG7coBSOP9aAT+QLi7XLRhBNXOz78g0JDdbYsn2nYrw1WqX2XUe4GOySPzbkuufGBuQ0paUs3bT/dZvXTfH7tW+ImlFqQ8TS2APklZUylZXnu8 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(82608151540597); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001)(6055026); SRVR:DB6PR0701MB2535; BCL:0; PCL:0; RULEID:; SRVR:DB6PR0701MB2535; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0701MB2535; 4:8q37TbH14hqOr5HaveRBhMcYuMdfHSlgt5FkczLmxyLEVzDjvQ3MByhG0imHaZZKGqqrZeRdnjT+iWSHuPMsGtx7xPFj3LTYZB0bzCfMPG3pQBsIaPogsD8GDSQki0z0BDdMgXPvSuF1e8p6goAEK1spNBvv95QbK8cuLb/HqeQqN+MycUIqHDaeKXToHMIFZnyAAygRu8/jRgsbjfxmGR/E4pmTZWlxJgH231TotPYKTQeaNOIOcq0KHX5aCmnwbkGmb50iWV6s/GjbHx+Co6A9I7fAdWEnJsC5bK7AHbfSw3hyXfGOZZPNCT73OBWB6YEqes1lKbYyY99exocUIwEU9Y+0ffuZP7IBxa95HVD3PWxAVXAJ1AsaoZOMVRq8WMuWroIh2UsP55B0uY28CIqR9G/cNLmldOPnnfimPfpKsCMOdGwMdzLbSF4z3dcQ5rk+0vwiZ6BXdu00VSjs2g== X-Forefront-PRVS: 00514A2FE6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(7846002)(36756003)(7736002)(97736004)(42186005)(50466002)(19580405001)(50986999)(106356001)(76176999)(189998001)(122856001)(86362001)(19580395003)(5660300001)(105586002)(23676002)(2870700001)(90966002)(5820100001)(33646002)(81166006)(6116002)(52956003)(50226002)(68736007)(305945005)(3846002)(4326007)(107886002)(2906002)(586003)(66066001)(92566002)(8676002)(2950100001)(47776003)(101416001)(46386002)(110136002)(2351001)(81156014)(4001430100002)(45336002)(229853001); DIR:OUT; SFP:1102; SCL:1; SRVR:DB6PR0701MB2535; H:erkkise-laptop.vincit.intranet; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: nokia.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtEQjZQUjA3MDFNQjI1MzU7MjM6blAvdnJ1NkN3TlNtaDY2SlV2K3JjMXND?= =?utf-8?B?SFlicldIZjlNN1lwNjV4YWJVbW9qWWZCTng5VVh1QnorQUJPT3h0RHR4bCth?= =?utf-8?B?eWkyVDBxVUdiTzNZNFRJV0ZPYk10U3h0aXF2MHZCTjNyVUZIeGZPcXNRd0ln?= =?utf-8?B?Z0RBemxLN0VSMG04dXRCakVFOHFOVUJZME9Vekd4T0Zra25zSEdYU1FuZnl5?= =?utf-8?B?UGZJdnlwMGV4K3k0VHVaRHlrSGZTZjhyNnFjS3FOKzROTWgxcXp1YWROamgw?= =?utf-8?B?a09YTDYzQlB0SEN4VjI3SjExR0xtSFdLR2J6MTgycG41NnlOa090OU92MHdJ?= =?utf-8?B?bEFBTEUxanBGYU1FbG9oaVJVTTBiQ0RXNkVFSmdZMDdRMEIwVkZhU1pWM3N5?= =?utf-8?B?ejl0Nmt5ODhYRXAyejNoTTE4b29tTVJXdkVCTm9qOENFNmVhYmRObDQvSjk3?= =?utf-8?B?RVdNd1hJam0yYytkTFBXZ3pFVER3bSs3ZzBkTlJkemdjb3k3OGJFTTQzM213?= =?utf-8?B?THc1RUtoa2dlZHZJcDhldVZEbUV0WmRacVY0Y0NqYlNjeHIyZmVFWDUxdXNP?= =?utf-8?B?QW90dU1DU0xnZ0ZSRXUvSG5idEx6SnRON2RtTEtxakZBRHNnckhRM2o2SklD?= =?utf-8?B?Q1JQSkN2RTl4SHpkajVIRnZqbXJoNk81d3RuemxKRDFyUWFLdEdDYUxoS3Nv?= =?utf-8?B?SmRkOTBlcDNYOU5aVERFZnMrTDdtWmtPQXpEaXpuV3VZTUVhODRwRG5jY0J0?= =?utf-8?B?NzEyRk5zdHVwbDN6WnRwTTdQcG5SNmI1M2VuUW4vVTlmNTU1SE1ub1NtMHFR?= =?utf-8?B?Vi8wUUVYQzV5eWp4NWVkTHd0eEEvNEdKSkdic1pBcXVSU2gxMCtiR2JqSGpu?= =?utf-8?B?VVo0ZUtoUy9yRTNrMUJiNUkydlJlWHdFcms3ZTZqVFpVQkpPUGl0UVJVc0xU?= =?utf-8?B?YVEvNEFxZFlZNzN5NURjdTBxZWhVWlY2ZVB5blpRbVp3TUhidlFNZkx0bVkw?= =?utf-8?B?d0lRVGtpKzNRTkdBNEFoK2lBMWJFMkhJODduVTBrYjFoMDI0RGNqWEZNMUwy?= =?utf-8?B?UVFKZmFHMk02Qmx3dzVRamZaVWlrZE85eThqSGJOQ2JOV212REdQUmM4Ujdx?= =?utf-8?B?Q2lFZFdZYlRtWWIyeVFjRlIzSG40MEZJaXlMdXZONytGM1ZKTmN1MXVoeklx?= =?utf-8?B?aWdBSlJrVHpxMDRHTTdkcUJqa0NaUXlTWTdYZkt0Q2NyZFVHM05Ba0NKZW5a?= =?utf-8?B?R3FFSFdWZEZ6ZDJmamJVRW5ueGxnN2VsYlhWRmpJTE9yWG5QU093TTRoNFFL?= =?utf-8?B?RFY0eDZTWFNwcnFtV2x1ZURWSkdsMS9IT1hnWFV5dHpQOSs3OWJ4SVNOaWxM?= =?utf-8?B?c21mNG10bkdMT3hSWEFyMFcyRWs2MVVjc3ZyT2xBWGE2dmt3QkhiSDg0d2xS?= =?utf-8?B?OFp5U0pYNDhubEE4c1BNcXNrbFB6bVpRbEdzeEhMWm1zcGZzejZLUlNqbnB0?= =?utf-8?B?SjJtNjlSbnptSTBNTk1nTlNqTzhyRHRvVThIcEVDd1Q4ZnU0TG93U3ZvWHpo?= =?utf-8?B?OFNoZUVmU2NVQzhPVmxBVzcwclFVZkpkQWZyNjZKcFM1ckNnSDh5SDJWbDdy?= =?utf-8?B?Ukc1enAyWGNsemRKTU1zaGZnbEFPWHBSdW9qQTdUWWFjWWpuTUxzUVFCZzhW?= =?utf-8?Q?LMKTsMynyKOH9AkDttOw=3D?= X-Microsoft-Exchange-Diagnostics: 1; DB6PR0701MB2535; 6:Y2eAeXBuQV8MMzZKwuyhihJUSmvzl9U1CrgjEaRF/6lclSVkHgoEattytNTH2j6RkRjwNlHZHPBzFcIYE1I1YHV5E/z4kcx/Iu79k5x/BXrP6zE0O2NiQrWciansiAO/tZmXQYCQsAk251frdWTHXyIdcS6vNAPO/MLeaY1BeL+QxLpToKDGjK+kz+Q6ophyHZr4KAkPEh0fYY8UkCvSAyr07k8FbZK1V4V9bg1Cn/LN0OqehnXKFuxcaBuwfOQzNNGIkMXyd93sgqg4cwc2rmORB0pXq+oyVSF46HvSmNfoiBSsoD+QVYGp6lGvNFyCcQVkd3093uzTZ3RjaX3/fw==; 5:6iqCjokLcZAWgsws7GHFh2P6TXT0FwOGucGFwEna8KR+/pBqk5dNfRbKor7dRr2/GP+eWBdqHZo7DbKYTnF/3IpwH/UtAHToZC5GQGlMNeHqbXznFnkzkqHL1Do5StFIEJ3P9omzwx3nNJMjg15JSA==; 24:bMbhiQ3qDCohsSuYMuqWh5naydzapvjHs/VRxV26nnIY+Myp64OLzy+bDkjLde+kTKt6zr9LHq7gY/2MSEK93nh0nUNrxsxdE5EEZOrNspc=; 7:VYjMzWTW3VoArKjSqg/hdPLomQa8NrN0CCGWDFmW2vXQKm1zeKygYUaSTHMtKZQyOopKJ9APVMMXRvpmUlvGGLjtguQfEBrkqH+WPLIWYMinELMxpsd/hN44LEy3BUZnBB319rajKEfuKL9zGd93m+pvOl23xuzw3YBWZtH0axZ2n/veti1NwHezY6c0pmIjAlr28mxGYhzTnqK2XPdhhvyEx3Zr1/JNKLtP0+A5+SW65SYukvnAyon3MdQkDFru SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nokia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2016 11:36:04.7742 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0701MB2535 Subject: [FFmpeg-devel] [PATCH v2 02/18] avformat/movenc: mov_write_ftyp_tag: write the major brand as a compatible brand 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 Cc: =?UTF-8?q?Erkki=20Sepp=C3=A4l=C3=A4?= , Yusuke Nakamura , OZOPlayer Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" when the option "brand" is used. This allows custom brands to end up in the compatible brands as well. Signed-off-by: Erkki Seppälä Signed-off-by: OZOPlayer --- libavformat/movenc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 525d103..571c2a7 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -4210,6 +4210,8 @@ static int mov_write_ftyp_tag(AVIOContext *pb, AVFormatContext *s) avio_wb32(pb, minor); + if (mov->mode == MODE_MP4 && mov->major_brand) + ffio_wfourcc(pb, mov->major_brand); /* write major brand as a compatible brand */ if (mov->mode == MODE_MOV) ffio_wfourcc(pb, "qt "); else if (mov->mode == MODE_ISM) {