From patchwork Mon Sep 19 13:25:24 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: 626 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp999945vsd; Mon, 19 Sep 2016 06:26:12 -0700 (PDT) X-Received: by 10.194.148.99 with SMTP id tr3mr27392528wjb.173.1474291572900; Mon, 19 Sep 2016 06:26:12 -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 f70si18802989wmd.26.2016.09.19.06.26.09; Mon, 19 Sep 2016 06:26:12 -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 DB555689E05; Mon, 19 Sep 2016 16:25:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20114.outbound.protection.outlook.com [40.107.2.114]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E7698689D88 for ; Mon, 19 Sep 2016 16:25:45 +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=sIblk9s89kCxG1h48Sj12rqTKGDcaQvUMMQjt4KN+O0QrB6uLTmzitIjLjnF8Sh2+ZyYl15e4S5YLxkla3h8ciloa/cDISyTyxRYCvKYA+6weoxiB6nugKeoVwbBzCslTMI3laQxP3Kbi/2UMewyDpMG4GTdKpgs3+mjGTXaL7c= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=erkki.seppala.ext@nokia.com; Received: from erkkise-laptop.vincit.intranet (131.228.2.24) by HE1PR0701MB2537.eurprd07.prod.outlook.com (10.168.129.15) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.619.10; Mon, 19 Sep 2016 13:25:58 +0000 Received: by erkkise-laptop.vincit.intranet (Postfix, from userid 1000) id 96D654F0F3E; Mon, 19 Sep 2016 16:25:48 +0300 (EEST) From: =?UTF-8?q?Erkki=20Sepp=C3=A4l=C3=A4?= To: Date: Mon, 19 Sep 2016 16:25:24 +0300 Message-ID: <1474291548-17810-2-git-send-email-erkki.seppala.ext@nokia.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1474291548-17810-1-git-send-email-erkki.seppala.ext@nokia.com> References: <1471943019-14136-1-git-send-email-erkki.seppala.ext@nokia.com> <1474291548-17810-1-git-send-email-erkki.seppala.ext@nokia.com> MIME-Version: 1.0 X-Originating-IP: [131.228.2.24] X-ClientProxiedBy: DM5PR18CA0040.namprd18.prod.outlook.com (10.173.208.26) To HE1PR0701MB2537.eurprd07.prod.outlook.com (10.168.129.15) X-MS-Office365-Filtering-Correlation-Id: f77be24c-16a4-4ac2-8ae7-08d3e0907e3b X-Microsoft-Exchange-Diagnostics: 1; HE1PR0701MB2537; 2:0Ini0fp25ZsfHUi0IwjeCM7ucnHPn91syL5WYo5G2UrgI58DDZrR2euihzH5sOcVGaCmMImTcK2BG7nV5C9ToVAFW9p5Q2Wd7nz+2C0WtI6a3UJbVfChGISiVz4cgnQ2oCwovP7DTR6PF+Nbf+TOLJiOgMYOEehqZhAG9lwJM647W9yKAm+tUnz+kB5U05U/; 3:u7tmTo6Kn91fF9K+hfZi8eFJkW+mBHfmQnYEBVWAjxwM6F5vZvie5B6eqYuY7pPS9A6JOcmR2nEDSRY4pxsrLPptw8BObN/akj80s9rqqq9xdyU5HvEHUX/gb/9iKLfC X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HE1PR0701MB2537; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0701MB2537; 25:+rISKAUGcmZAsYcp37Jy/LlMc03PpNiBtTgnez2Ayy9JMTXe2SenSJyDKD0OVDOh/VyXN0ct3mSfHpwtDWNsYhgec2z+MuVa57LoNtqkeBiOvpsyXFrfNdIINqIuggPeRf2NxnlnS7J17NhxgTlSp8q5+LWC9bLCwOv6wXOILEMWZYlN1jfXB3kK12dzokBpKTr638M3QQm3fbokHiDGIjlI/F2YxlWQU8lY7W1mIygs1w8xi4eBv36+O0s7bonuFP6Dy+o0h0OgkYjXugr+lOBzckuSLzdXDHn8M6gyRpLO5dNKgBFP1Jy8tp7QpG+75umo/ZjkOk9Iv6D0HglmBbOvquxVKCa/iTgRjdpPZQ7W5/3sCDQ+Ofi83cnCu0eeXBkWLJqK237mZUr2LasYW2AZl7zvxzKWM4BYitGKM7Jav+wMQvJAcvag8FN7Oc4/ajQRMIilS4JEuiNCogZwryXFyt93/lwH/yjdkjVtUZyoH4HtKFJCHOZHDaxx5lK+FLQZcYyF+pQ1Yfo8Jzpz8isaT27hDiVCA2amq4JhTELyfrHOSd6xsmAQm7F4vZFyg+NyXMb2v/8inQmoIG4InFPBf3UFDWswQKxOyxoknTVg2WDphlfbR8ZYdX7iHOnZlsPiOz4vE0b4x/8sb5MleWMI2PWT+ooEBr8jtLPFMFsIWA+jBdtSd+YpZxyK5Fx8HcFlkPa4+Uu6Tuo4XkDtuw==; 31:htIhd5uCsxjpX08OqoZ2gWS/1z09QjXzrMFykvRw+eFp2+RvHNxGUiRMv1uIf2z/g13UH8k2mwyzIiXMWOht+ZuceRhcvM+2bBVcBAcTSQd5NNOVbunIy7bRFsp5FLRMXiVIlGBZTNKNYdJntUd/eF7E1/BF0/NOx310swsBO3HABc7hUXwW4ieCXDuZytTA4RDYcaSKKPk4qNKI2MqnvGp6fduST4wjsyuPemGWkRE= X-Microsoft-Exchange-Diagnostics: 1; HE1PR0701MB2537; 20:7vvoCtmYwnHjj7anvL5lFH5NCAyDjqMA0puN6qjjyrnqxxHYtuC5UpV3ToYkRYhvEr7DwFxl0y6d1llvl7XuZLvh3Aumrf9fDmQxGOXhkExD/gvYEgOO0E9QO2QoTmVJmga8+ZT68IRZpHpvcb7pfu0C54SJAqaPeDz/C3DORdjCaFssDcXUddzjrFyaAS6qWsgmk90yyKcp4hfDqt2Beh3h08Rf15RWusH88PbfC9DZO04bq5I4o3/4umQP3DxgRnALk2O1RhCy6HBE1u4oMX70dAi1xnWnB/XgICS7g2vVaK8OemNVj93X5TjnkLeB60aHhUKtj/L4qc719QExz9BwAlOBhdid9MLX5JC5xolLfcjU0lLTlyTqNdMupaEpqm+WpNBne0+RCAn/A2PQFOjtoF6KOltMr1Gsx4RkDfMFBavA6rRcDufJEmQhIv8TxbvV179QmpJGqwI7ynaCGWPzoLxM0T1lWMgL3LxlCTe+zzoLCcoUnjuwH5IpyXPg 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)(5005006)(8121501046)(3002001)(10201501046)(6055026); SRVR:HE1PR0701MB2537; BCL:0; PCL:0; RULEID:; SRVR:HE1PR0701MB2537; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0701MB2537; 4:Fu/wv7MLph6DrzRXR3N1ltefqdR5mWAx0D1/VV8+uxa3MtbkYJealulc3e5B/eNcwv9qMmE/S3ALBoK9qTz2SoUUqkjD/2WpQw5Ud562FdOwYN/QlgHiI/YB6Ac9N/ofV/Rm6tEW8aM+Be0aK+JSl/6w/9UuL2YraKbWzaL0lwYx8yp4IXexofNq/qNWAtnJQ1RV/lnPI/UKlz4Tf5CLjEsB/gGvZLcSCAB9DpIfVb6B2CU1onpzXQMoyMNHMMI2gDZc0NGCmEEiHNjRWdshyBMfn78RBXoXNLFqUlomgYnVegAeCtM9nEhWtt0rvVI0iTp+yZcNYVPF3vpO8zYAn5K/nPoUC07gHCleVUaZXO3htUKqJGXLMRM6awWxya8usZ/5d0IbWQLw5EaL/anWnvLJVQXY2aRkxXpDW1n8keMzLQHBDTfVFIwDDgWAJ8iMQrIZgziOS3l1np3DjHyskg== X-Forefront-PRVS: 0070A8666B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(199003)(189002)(105586002)(42186005)(4326007)(47776003)(4001430100002)(122856001)(6116002)(3846002)(5820100001)(586003)(97736004)(68736007)(52956003)(2906002)(2351001)(305945005)(7846002)(229853001)(7736002)(106356001)(66066001)(50466002)(50226002)(76176999)(50986999)(90966002)(110136003)(450100001)(107886002)(81156014)(46386002)(2870700001)(33646002)(36756003)(101416001)(23676002)(86362001)(5660300001)(19580405001)(2950100001)(189998001)(45336002)(92566002)(81166006)(8676002)(19580395003); DIR:OUT; SFP:1102; SCL:1; SRVR:HE1PR0701MB2537; H:erkkise-laptop.vincit.intranet; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: nokia.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtIRTFQUjA3MDFNQjI1Mzc7MjM6dWsvVVVCU2hVQlNyZHpob3B3KzJCZXB3?= =?utf-8?B?c2FmMVhDZUZSeVB0T1c4NEhnV0xaT2hNQTBHUDZMS3dabFJmMEc4Ny9oUk9x?= =?utf-8?B?TktyMzNBMVN2ekYzbjllbmZTbDV4TDZ3OHNVcWFUU2cxMkk0MCtrQmUrLzRp?= =?utf-8?B?TzYrNjZsSStTdzR5bHZQcU01OWRFY0Qvd044SEI1M1U2MVppOXhHM3ZDU0Fs?= =?utf-8?B?THlWajBVT0QraDVxajFkRmR2bzV6SFZSbUgzTGRjaXFYaHFPNnRkQ1djNzE0?= =?utf-8?B?RUYyM0l3S2xqZEZyb0xrclZpbG1YRkdrQkxPNlVWZ2c5N2tYWUZ6TmhqYkhI?= =?utf-8?B?Z0pmbTZzMCt1VGRUYWU1TlkyZXVDUmJrME05ZWpmTEtmLy9TbC9UeXpIVW1Q?= =?utf-8?B?NHRabUhlOGxjc0J2WWxncFRlcmxKdTExRmZCTUdjaC9Dd0N0bCtBSEdUNmhy?= =?utf-8?B?YmFBeWdMWjRBSVBXcW0zZVVpaXZuYWpXVVA4R3hxVTVjUDFxY015NkxOeTRs?= =?utf-8?B?d25WeFVkd08ybGRqOGh2V0JxTGxEK3JScXlpdlR1ME1xbkE5ZnJVdjY4aGJn?= =?utf-8?B?RTcxSS9pR2FYUzg4TVozSkRmZW9Xc2dtTmJLdXFRYWU2QWt1UFc5R2toSTNo?= =?utf-8?B?VFJlSW90b3JiMFRpaUFoNGpTY2RXekkxNm5RM0dVWTM1K2I0NEF5ZmpLbUJB?= =?utf-8?B?c1BBd01haEk5T1NYTTh4NGJvTktBbUVRaWRvbmhzNlJzbi9KOVFlNnR2RnFv?= =?utf-8?B?NXU3NldwS1UzY3dIMDQ1VHJQZ0hDNzdCOG1OVDdoUVhYQ1N4bzVpNk9Gdloz?= =?utf-8?B?NC8zbHVMbzhyU0xwcnBFUVNSYUVSb3hQazdYOW5kdXB1Rm9FbGVtaDNwMW8v?= =?utf-8?B?SmIyYmcvUzViaGJKT0dyNlBGeUxJNktsR0VZa09sc3gya3RRNFcvRklsaUI4?= =?utf-8?B?WHJRamlFMllubis0UExaRndYQ09Ld05ydEN2RVpGNlVyQUVFdFJLMXpTM256?= =?utf-8?B?ZG5mTVpTZEZuODZ3VForb24wSFNOVzJTb0lLckNrcytaMk9WUm5vV2ROQk5l?= =?utf-8?B?cjFEeTdseElvdE13TTVHQTlXUUdUbUlFekt5MHRHMWV1akNBZWZ4ZFVveVRS?= =?utf-8?B?K0JLWEl5V3lCQzgxV1ViQU83amRlWWNpbnVKUktqQjluTnowNzNMUFlmb2tP?= =?utf-8?B?N2dGMERFclFudzROTzh1QVM5NjAyRWF5Zktycm51NHg3MG1qSTRzWFA0SnlJ?= =?utf-8?B?TVJnZUZTS0FodHBoQlhmZm01S0l1YU5HQ1FMQkpFMlpEd2lRZ3dzTUR3RVVQ?= =?utf-8?B?WVoxYVBKam5VbjN0ZlJVRDhqOGpnbStrY2pxOS9QeVZMOHluVWxEaXZSeENN?= =?utf-8?B?YzNGbFpLRVJSVUYvVzVNV1VIdXo0Y2dPb3BJSGEwRy9aM0pQN1h2bTVtVkVZ?= =?utf-8?B?U21JYWhyd09YOCtmZ1ArTFQ4ZTdYcklYcGxMQ1VLT3Z2eXkzSGprc3RpcTc4?= =?utf-8?B?dEpCUzVaZG1jNW1scnhEM1B5bXZTV3lNWnBMOFNUcmRFbmdXYldGVUFyNHM3?= =?utf-8?B?cjRSQjFBNmVxY1Y4aGlRbjRzeDREeGsrd1RwOGRaOFRzUjMwQit2Y3VFUnh5?= =?utf-8?B?ai9xa0ZENEl0NTM3U2FWQ1h0aFZCYzBMZ2J3OUJKVUhuOVdrSlZiNUlld0hh?= =?utf-8?Q?uAvxzeypTFxivVqL1f3uZq4v6iHanbBkhn87jpTm0?= X-Microsoft-Exchange-Diagnostics: 1; HE1PR0701MB2537; 6:A6jfA4j64DCYVWRHvyHERWTW1Bj4U7HOiWIsi6nFspR7L78XFeYCUpxk5yQluE4u3LuhnLAyzCRXCsTcqNaNv66yECwCq3349NSWpYCbgqqDR/jViU9mrvhImOUgCADHA4J1y9w5mBY8K7bMdj6vBDIl4oQ2jiKYT4bbkN3td0gl4WJZDgWki1z6+dAHITMVCDhf8J1BgJMZJsMWtHtaZ50aQkU1CRswSS8dcePhenaxYM92r++WQHGsLqj4+7Qij7Cp6Q4R0hTKK+5TGOXRby2/WT27r1Mktwxk7Fr0hWzDp+V6xtRWvsDhCJuEImwxIqB8LWnYcHIqt/0mDlsS7g==; 5:7YpmOF29VPx0zKdZaJOzaF0qNr8RbVWL2ZV0cT3quawwyq1euT09rE9jgLn1KL9JdMibQZv2VzijTp5ChcEQBMiauuu++mG4MkZUNvpPqG+wkysRTEpmLI8kzd0xi8BrFdHCcAkTSCoG1p+gVNA6pg==; 24:2yj+XeEhIoejgOzl0YbLrYDdf+ahA2QZ/ku0x7SeisqLTC3EDPiSzN2ypsjvbLUH97C9AU5VRGqAjlInkYUnb3EBkn7CDfr3RRYXLoxTsMA=; 7:VtuPWtunf1PW4VRq3xr7vADshAs5NliVLbr7yXHYlPvz+Dfz/avqL57+UAUsYIIbq97xaie6QNbc/PP4Nt9R9ZtBQQeOEwn4OSzyTrjUwNZ4DpCPfiyuMqxmHwsPA/9T81di2Im+myVamY50w3SQljP/TD8kDh78Uw/GKeEtzIYXUrye1udAPClV1hsrkfjRSg8MyFP7PTmcMEKTuSriN0Cg1C5IVud2qs7xQ7CEdI2wy3oMd1M3RZX11H0Es3PHDNn4Gf7AwnytWCH2ML1cElL1JaFGK8sd7q8uai6KozQhE5kfLivKTjDuXHeK+4xM SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nokia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2016 13:25:58.4213 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0701MB2537 Subject: [FFmpeg-devel] [PATCH v3 01/25] 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?= , 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) {