Message ID | 1472643361-10118-8-git-send-email-erkki.seppala.ext@nokia.com |
---|---|
State | Superseded |
Headers | show
Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp327940vsd; Wed, 31 Aug 2016 04:37:11 -0700 (PDT) X-Received: by 10.28.135.133 with SMTP id j127mr8863617wmd.9.1472643431266; Wed, 31 Aug 2016 04:37:11 -0700 (PDT) Return-Path: <ffmpeg-devel-bounces@ffmpeg.org> Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dd7si43522453wjc.269.2016.08.31.04.37.09; Wed, 31 Aug 2016 04:37:11 -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 ACC1D689AD7; Wed, 31 Aug 2016 14:36:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0102.outbound.protection.outlook.com [104.47.2.102]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3AE9A6898D1 for <ffmpeg-devel@ffmpeg.org>; Wed, 31 Aug 2016 14:36:03 +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=VOQh38kMaJaEoESRMzh5iohihZ2qoqn3tkk+WcwpoV4=; b=DcqiqXHZEJ47Qu9gVvft5FOMTkRcORSvnkmI7EhIUeFpLilgi7ZLkH2nG+C670qUhXN7O9Q8eGl3K95zhlGRxNdhm/nefssmSEZAAqlHPRO3Re7c7/D/BuPI1F3rz1BomB0GSqsCfgu7jIEDdUWnWYYBJPV2DAT6JWhi15zg/BU= 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 HE1PR0701MB2540.eurprd07.prod.outlook.com (10.168.129.18) 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:07 +0000 Received: by erkkise-laptop.vincit.intranet (Postfix, from userid 1000) id D6EB64CB94C; Wed, 31 Aug 2016 14:36:01 +0300 (EEST) From: =?UTF-8?q?Erkki=20Sepp=C3=A4l=C3=A4?= <erkki.seppala.ext@nokia.com> To: <ffmpeg-devel@ffmpeg.org> Date: Wed, 31 Aug 2016 14:35:50 +0300 Message-ID: <1472643361-10118-8-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: VI1PR0901CA0071.eurprd09.prod.outlook.com (10.167.203.167) To HE1PR0701MB2540.eurprd07.prod.outlook.com (10.168.129.18) X-MS-Office365-Filtering-Correlation-Id: 7d515109-8c9e-4a76-95d3-08d3d192ffd5 X-Microsoft-Exchange-Diagnostics: 1; HE1PR0701MB2540; 2:Ieh5az4zmLHX4c5NsFgapOrKyvVC4egdSgUIL1c5AvTimtGGQ+FNFUYeaaqW+gS1h09wPOhN8LO7pySSmkrziIfC+022CHhzwbzvTXml01dlLcTyOk78LKH8Dpm6BrF5o6WrcYJYFIe4VsTu4y5ejWqUZ2slSk47LiYnldcV+zRRUuJ0FsgP+4XeGIFTwA6U; 3:BEeDaEcCTcIgO1GZGbhQR44Ymk2Bf5+otgFe76MoTdecBUCdhSP99zIFehFsh1n5IbII8hQ7PScME55pkkA2Db7+9PnH2tb3Z+Ba35oiBkx6r7zCg44AA4jQ7oAOSfMz; 25:tvyZ5oi5pdVYV9oy1U+RdBIAaHKye58f4HjwBegB0hrleiKge5YQVSfaXFV4ispujTbEUo4b5+m4p02zK/sLoja0gBCFaz9UwO9hG+jW/ORl6k4yrLMqq0dJF1e8n/q8jx3JljlpeytAxSAbLZVV927pevWTQRZI5SbLQ4GDxgxLm2zDiPfg5YtjtQLCBv90o76r5buUySQ/4u9hCQBFiiF8QiZqVkVCyPbPcxnJucCsNfvk9QLwFnGx8FTDJ8ShkKe+VrQUc/QjNeCiK1XJC6w18udmkZmi1r6aAhe/j5oJgV/qV2JgL8OPAyMm0M0dXDAJB6f3/2W9n+mAJi6mtpvqR51JfTAIBbECKmXm3J/hjrIQtMAETBN/v+iwKWhTZWWF1rl1fAQvj9Z7vXhfm4pvJGfByQVlnSUapM8ZI+E= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HE1PR0701MB2540; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0701MB2540; 31:GwwbR5VvXQj0McdMznfSLSRmdWGagNFlrfZL9eI27qHLCtkTgMDkfKL3Hs74r0oKgsxVj7p+psUrSIAraHf9AJpOXNCHTYt9rDISEqfCdK9j4JQDREvp02JBaj2tRCKXy/AQ3G9SUjxJtRCVQtm1q0bATI5MKg80qni5n0UEXfWzcDzyGjKTmZN+2oydjLVZp5fYAWwYB263qVT4LvceuR4LB9jMIlZkuTLCjyPafAY=; 20:IrnVXtWx+HHN6l+KTeVMOovjy424a806cHH1cRsXptWzrjDcDCi984VsuNVbiNAH5N58tlQRXUwtM+PWUF3AdRJJMh1+dZhknkew/K5iNIre4X6ovAp3xlfvocpgsnJROh+ArS67XK3EGUTrJCoGAECmpS0hWzkb6197sagE5gPF4d5Y8875Xv11QIl+BjEozjxnwzMMF31ErFuS5jyqS/fhyZW+CXKessMfKupHsGBOEGkhzxpYMrvejeF5waLmZ2jt9Ke8A+Hnt2QDq4lY4MbQ2O7YeIUVBmUhQQOFceqZ2ugGipD35QdP+G5MNyVtMJCwHWA3/wqW4dZ5wxKKwA5Mk+BZyhCCaL2aPGvT56e6G8y+MysK1qB7+SguRNOtt0kYXDt5UfB7zDrbGHLYqlPvR795nTkaAG4mi1TLRqVkNl+BZ09NpbgJGdov48CxjwAWB3uFkAm/xjnhrjYmZmGj7EXb/W9xcLKoGw8i7eIS7O1FhEr7MOfPnmQbewEk X-Microsoft-Antispam-PRVS: <HE1PR0701MB2540A62556EED8B9A2DB9944BAE30@HE1PR0701MB2540.eurprd07.prod.outlook.com> 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:HE1PR0701MB2540; BCL:0; PCL:0; RULEID:; SRVR:HE1PR0701MB2540; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0701MB2540; 4:2lfWav+INQRrUjqnw969vcfH6COVDjTkBeY7uDQFDcA0yIcG4WizwzXtNkvM3nFFPUSLuCIfxU2d1XR+vIXWgzD2w5GX1Din6JCoONxubHxgTDIsxP9s7YKxiAa9yurivtr2GpjNEvbDRouWCVzSfbpGMKU3tR0HWwwofddyPBBME4o5e9hJ7Iz9ToLahtYT0MFPHv6BoXJgpzPVzOM4OECSABUGhM2uaXzvrgFqCbSO8vs58xTNE6AYfceTI5yvkTUpWDp70EuYJYY7ybvaY+IZf4tKFxNv8STsSkMskCbTMxz7RYL3Mlq/27GWVYDO0sgwhv2g55JF3zDu9pAckgKYw6VuE5U0NlSnasAr6NvDFYeKUnTz7JDwtTSTSnnAzH+uR7RJZRHR+grjqCeSCgP+OaZjoN4XaUGheMfexpLwFA5qvt/SNVZoMd4IVWLdnYWEY0KumbKFLMIGsoAg2Q== X-Forefront-PRVS: 00514A2FE6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(199003)(189002)(101416001)(50226002)(305945005)(6116002)(7736002)(7846002)(586003)(3846002)(229853001)(50986999)(76176999)(68736007)(42186005)(2351001)(5820100001)(50466002)(8676002)(81156014)(81166006)(52956003)(86362001)(122856001)(45336002)(46386002)(19580405001)(92566002)(2950100001)(5660300001)(97736004)(107886002)(2906002)(2870700001)(90966002)(189998001)(105586002)(4001430100002)(66066001)(33646002)(47776003)(450100001)(110136002)(106356001)(36756003)(4326007)(23676002)(19580395003); DIR:OUT; SFP:1102; SCL:1; SRVR:HE1PR0701MB2540; 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?MTtIRTFQUjA3MDFNQjI1NDA7MjM6V2o4OWEyZ204RUtiLzJxOXFqRElBNjF5?= =?utf-8?B?OEhyaTRHSWZOTXdxMUN1Qi9LY3hxZ21QWVVKN0xqdTdRS1NQa1JIREJKQTd1?= =?utf-8?B?OTNqUXMwR2hRYkt1RHRYYjhnQmlZa2VWcW5aU2QwSHpUK21Nak1UNDVwQUlv?= =?utf-8?B?S2x4YmJwaUh5bit1OHRSNXV0TTB4ZnR2aEpqR2JoMUdNV3ZkVnpUMXVXSWxL?= =?utf-8?B?c1l0OXdnTitoUHFhY0xFNkd6b2pVVDdLWHBoS3pOUEhWWXpaOWFJT2lnWWE3?= =?utf-8?B?K0owQ2k5V0NIanJsSUEzeTFDSm1TOXZsTmFOZjBmb2dwNmduckg3cDl3NkN6?= =?utf-8?B?Njc0UjdENWFNOXVhRXJSaDN0anpOd2lhOW5TTlc0bEpFNDF2NE12ZXdJRUNH?= =?utf-8?B?c2VBWEx0SXJTVTcvYmxhVlNDak9KZkFjN2JvS05qM1JZVVlqUlZ4TW1hYjlp?= =?utf-8?B?ekp2T3R1VHJ0MmlsSytDcjczLzVHN1JEamoyUHBnKzhKVklTOXdzY2dRTUxJ?= =?utf-8?B?WDVFdmU3RE5QL2VMOTQ3TVBZYXRYUlVrUTlwSnJpZGo3SmJGQjQ5Zm9OZ3J4?= =?utf-8?B?cVQ5SlBJWXY2RDRTcFV4RktHVHB5ZExxRmluSkZNK2NCRkFSbjl0ZHlzcnor?= =?utf-8?B?RW5CZ3BwOVZpK2Rka3V2MFRwNUtrWVRVRzByeHg4eTdjWDRpeUlMN1FhaEcz?= =?utf-8?B?d3hIbDlzcWdpa1AwclVFUC9PTStJMktlcC84cHo1b1g0MlhWanV4WGhGKzBC?= =?utf-8?B?d09DQVl3RXB2ak02bmw0VnJvYmxUMW5HVmtvL0VrK2c1SkpNTk5NdUJOWWhr?= =?utf-8?B?NkIzeHdvMnl4ajkyaEJxR0NlV3hxUW1MaUE3VkpXcG0rTlg0Y2dYRXJCbjNZ?= =?utf-8?B?M3NBNVQ0ZFFmbWROeGRXNGJzLytkK296eUMwYmgzaDh6cDhEaUpKTVJxTFY4?= =?utf-8?B?VWNtakY2QUJzdEJydDQxWXpieW1yQ1l3Zi9hejFlalI1dE14Tm54b2pUd3hZ?= =?utf-8?B?SXoxSDYrb3Nld3hIL0tsbkYxWGNFc2l3ZnR5OXJzVHRuU3VzMVNpS1pReWFJ?= =?utf-8?B?QVRpa0RyUlhrelE2QWxET1hGSjNwSnFld0FZaW9JYmUyY1I2K3cyQ2EzL05Z?= =?utf-8?B?ZTh1bHRWelFYNnRndnE5NHd1OVJHck9XRVJadWFOTHl3T3ZZZE5XcmlGeTVQ?= =?utf-8?B?NGdBU1cwNlVqSG1ISHptZWcrbGxSdzN4TXBJS1JLTDAwejViaE56VHlkeDRC?= =?utf-8?B?am02LzBweHFrZkwvcDdVajE0aEE3dXk4NnpVazFYczQ1aXhCeUtpeSsrL1hr?= =?utf-8?B?RVhyenlwZ0VKSVhJeDlnTC92OEpISjdPR1BvS3BsbjV0ZEJ3MTB2NUlGNHBR?= =?utf-8?B?alJyczdwWWd3MmowUWF3MEhZZWRvUkV3VXhneWdvcFd5NjRtZzViUVdUbTE4?= =?utf-8?B?TUlCeHhlNnhFUmNRR3hLd3ZFdmxScjBCQTdTbitvaUQzWjM2QTROUlprRksy?= =?utf-8?B?OXlaM3ZSWGZpbkM3TUUrcFVFSWhUVXpRRGhEcXVxbDR6OEszTlhkaTM1Rmp5?= =?utf-8?B?YklJU1phenRGaS9VQnlMQnhlM3c1QjlISnRaSlFjZFBNazFtODZwbEhDbU1X?= =?utf-8?B?MEtKcm1WY1FqK3FuL2gxK3luaGI5c3g2OURCOVdsK1dTUUs4bS9zdE43Q0do?= =?utf-8?Q?/8nnNmQXEJ/sSqIhb4PhR+Jf/fUFRVrkN7AUwRRjp?= X-Microsoft-Exchange-Diagnostics: 1; HE1PR0701MB2540; 6:y+vjCxVINw1Sm/v3DdD5E+8dtjbSw67cUsnhQQ+62mMmin9qQvDAjDTB4uhgSk8mYMicuHIeuOo1ZEwRn7Dcx0+sVj2R3DVrWW2o/Zuaf32FRcHXFw1PL3dh1MfimlRB0OCQ12gLKkrojLO+8IIneXxr2GKl8JJcdYwpU9cOHkdqWKVl2B13UDbNRkTCYLoKgl0j4zYasHSfs8zXZDJMuyCNrw/vCszQTx6UU2bX13SkZpG8apQjV/Ppn90eyyzdb8VkNBfW0lzX8jtL5ohqnVNsLSnH9y8fC9y+TQVe4D+cLbA+kmQm0ICyGDus9v+5BSXKIoOJwl5ncCjrlXgS4A==; 5:57x37oRkj0yfpToufJjEhaS8X3EKqkm4WkUp+O+7seBh5K+dxTXIZSsIjLieKrQghANwfr4OYiyQBwu1Etp6jLWIZllxtT6PF9zp06x0AY7yoPDfDMEXNgXD6RHgMRlXfiR6jaGLrI1fmPkfi3gMVA==; 24:MjoGR2kXpLcmSNXa0CzXYDTFD9WRpWY2D4tGH+ZNBw4/9FHt8Ll8nzWjiXDBVK2OjtU+0Wx1jtL2h2EJ5NL4zAhQRIgtlMO8jQU4AZ9N0f4=; 7:lcPQAv0RCAEFVPApcUSTa3jvupYi1ZSV39UzY+D1Rvj7Uuc71IriIvVTxN9XEWYnx4IwzTJ0sclGVMlAMujx4T5ONGey8JOUV8Zip0lMN7QwNFxUE8pulu26VuzJn9yWaCwTlrM5ycNxU80WmKEkrtnAxsy+OGZiWrFXBi1SN+Th74orJkhtoSbi9RSjCJukX+gQbk+mMBplNVbfX3lZsvdciP2Hb0evuUutTynCE67oqzG7LI2tVi/8mGNlYQZf SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nokia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2016 11:36:07.6139 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0701MB2540 Subject: [FFmpeg-devel] [PATCH v2 07/18] avformat/movenc, isom: support metadata in mp4 files X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org> List-Unsubscribe: <http://ffmpeg.org/mailman/options/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> List-Archive: <http://ffmpeg.org/pipermail/ffmpeg-devel/> List-Post: <mailto:ffmpeg-devel@ffmpeg.org> List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> List-Subscribe: <http://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Cc: =?UTF-8?q?Erkki=20Sepp=C3=A4l=C3=A4?= <erkki.seppala.ext@nokia.com>, OZOPlayer <OZOPL@nokia.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> |
diff --git a/libavformat/isom.c b/libavformat/isom.c index 473700f..9fb96ef 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -66,6 +66,7 @@ const AVCodecTag ff_mp4_obj_type[] = { { AV_CODEC_ID_QCELP , 0xE1 }, { AV_CODEC_ID_MPEG4SYSTEMS, 0x01 }, { AV_CODEC_ID_MPEG4SYSTEMS, 0x02 }, + { AV_CODEC_ID_META , 0x03 }, { AV_CODEC_ID_NONE , 0 }, }; diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 282551b..883fa57 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1175,6 +1175,7 @@ static int mp4_get_codec_tag(AVFormatContext *s, MOVTrack *track) else if (track->par->codec_type == AVMEDIA_TYPE_VIDEO) tag = MKTAG('m','p','4','v'); else if (track->par->codec_type == AVMEDIA_TYPE_AUDIO) tag = MKTAG('m','p','4','a'); else if (track->par->codec_id == AV_CODEC_ID_DVD_SUBTITLE) tag = MKTAG('m','p','4','s'); + else if (track->par->codec_id == AV_CODEC_ID_META) tag = MKTAG('m','e','t','a'); return tag; }