From patchwork Tue Aug 23 09:03:26 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: 247 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp2180355vsd; Tue, 23 Aug 2016 02:05:58 -0700 (PDT) X-Received: by 10.28.27.143 with SMTP id b137mr19589473wmb.12.1471943158801; Tue, 23 Aug 2016 02:05:58 -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 bj2si2136233wjc.163.2016.08.23.02.05.58; Tue, 23 Aug 2016 02:05:58 -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 14C22689CCE; Tue, 23 Aug 2016 12:04:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0097.outbound.protection.outlook.com [104.47.1.97]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EF200689BFF for ; Tue, 23 Aug 2016 12:04:13 +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=eyatavPycawIeggseyXRQDiIxMRT/sKjB1E67Ap009c=; b=ZQ4MjIqahY/qGWJJrd8cAWKPBLoDXJ3hqBWn1xxbQMS5+kJTAYbDsqlYO1EOHgty1f2z7p0K7ijsFGHgja5Rj7L2urc/jbPFQYzOYG8O2Y52yNGApcLCBQc0CID0c2045i7Td9PLUIkMM2gRXHdKpqnaXhIoEIS+472a/XBh65g= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=erkki.seppala.ext@nokia.com; Received: from erkkise-laptop.vincit.intranet (131.228.2.4) by VI1PR0701MB2544.eurprd07.prod.outlook.com (10.168.139.145) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.587.9; Tue, 23 Aug 2016 09:04:09 +0000 Received: by erkkise-laptop.vincit.intranet (Postfix, from userid 1000) id 574214449EC; Tue, 23 Aug 2016 12:04:04 +0300 (EEST) From: To: Date: Tue, 23 Aug 2016 12:03:26 +0300 Message-ID: <1471943019-14136-9-git-send-email-erkki.seppala.ext@nokia.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1471943019-14136-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.4] X-ClientProxiedBy: AM5PR0101CA0010.eurprd01.prod.exchangelabs.com (10.169.240.20) To VI1PR0701MB2544.eurprd07.prod.outlook.com (10.168.139.145) X-MS-Office365-Filtering-Correlation-Id: 7c563186-038c-42eb-88bc-08d3cb3471b8 X-Microsoft-Exchange-Diagnostics: 1; VI1PR0701MB2544; 2:Njl7l7VyJtINBOwroI9AaK5bHNBHzHwvGVQvpjbyUJgVE0U8NtWHZiZ0hRF4wGBW3SqtrbaI/Snja3I6aMqlT6sRflbVrrR8VFbi4A4KNAGs6pCshsXMnIfGdvrvMufX2T3lBdIm9V0+0wbBu0jp/ZTNTgXAmU1ehOI39D7E42XdTlHZUCGNDoiZ1hS/Q7Nm; 3:k3PDYEEeGYeYnkBVG4IPkNUBrQyiYhFX4Zqgul5PX95Bc4zrr1WvKbxyhzvlOJm4bvtzxTb3XwigZHAWx03x/2PfW/0vdwfFzMds1pc5YntYTHogbIpEsP1CgEYdeMKv X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:VI1PR0701MB2544; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0701MB2544; 25:M8Pc1VZ+2G2ZMpXtL4wLoEA/5rft2JX1wgxqQ5GUn2N16H9ucbciqyKPqABp+hOistMbmFdIPAX7OmyppgPCl8PgbmhiLImbZWefl2y0uF9H/+a7Wuib+eQytYnxc338W0bRdzA0Kr2fX6VyqchWHa5DmfoQlNivXv8ylCgdOkbT4rkQk9NT45Q3mLpKUFijzAtbgK8QfbsFeT29+Sb1PQAtC6/+k/Bshm2ljaq0cRaesb8O17abY46bY2zqEjaUeXicM7LroAL1fA+hOR2N5iTLsA3HI4sB/0Z94Zzjj/cakI652GA38GWeZcbCr0wyHcPaoeDLnVrJuhDDm8hiAMynpHCRcY6IVZyJ0GHQQw6XHlBH3R86GvAJETF5vn7y/2EM1nxjC+kNTdfgMmRSLt1PCHsQmZSwhhapGbW1BmHM91f6ZI8lyWQaOhp/jDoz3Gv1H8iSRgp17UBO68bsXLnGpmLwdYtNsMLbj7lzlBFjRsYShKLe7kvIDl5OGaPbyzmdHtNiiHcu7tkCIEIDgJ7KoCK3kpfvIRw8bg8IKozsESFfyDN4n57+1DLdsZptVP75qk3BSQChuhnVJAJe73qlCFUqcYw6CpQQcrGqJSUZggywEFUljkXel5E+hQHY4Y0nZFnDe5KeeUbnj89kLcIcsKZqbsMTLJ9WbcmwOS8pOE7swps7jUgohSJ4dt4kWPyeSm54imW6r+fK/vqXcS/bouNGaP2jvt289rajZuDP+Maq7lK99cUO9bU7pzEkN4V2BPTc6QQHsRsPCwikpw== X-Microsoft-Exchange-Diagnostics: 1; VI1PR0701MB2544; 31:NJUhJINkgbmNee3xnPg5RUrPw5vMnDlgWBmnCI++qJajvs6vuvzM1v6x7shd5XMr7yv5AEXO3M//dlMRididieGaqWxYxBRhRgSbsTL0ma+uMWB6U3IxXowz/GsUCApHsoZz8Ohc+dhLnQZphGHG1H3ohDrlL6ofMPP6ymlpVOhJjL5auN9qM1BflpS7PO1s0YEm+F9OGE6ySJmRb0Y92nevjGhizBCueQ2F/tCMN34=; 20:BROQKdL0RyBpIw/oghpTF8lLN8mmaI7E3ceCdHWd/VDnrQcMNXnxP9GOmw4XEKD2H+/aB2jlq2Qkn49k7spF7bQ3gY627Be6yTQcsDLESDl8RNGBckcYbHa9Kffa0dBxGYrGE4X+GWQO/o6qt7EjjPBDmiyUQrDdh36Egj+NnDWeZ/lqBL8U3cARKDel9gtxWvmzlN7rkhjKDcts2qnSvA8ueqlm+DfbD+SXkFdqbLLdJQsdn+MrFp6KAzJD9CrIVukeCdiADdLk7pzJqqXe2OXjiodcv1CdkjaqOAt3e8NXZgsZ2cYoXBtSp9QPJ0uuav0S8SBGi/y7tLOUq171mrFsz6u4ChbL7MddW2yq9brn6XUnZ3ZZCVZdqOAiYl4ntc4Te5+fzUcnvkA4ueP2i1oSgP3559rHk7wIZ7gJWT1F2r+LBstHyQ7dT7ekEOUrmTZFpW0EiqUf++K5WABZcMT20SjORnyxm/QNgZlChYobLXYDPyFWSBGs7YMz4YGZ X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(23117731428927)(82608151540597)(31960201722614); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(6055026); SRVR:VI1PR0701MB2544; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0701MB2544; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0701MB2544; 4:LjGbND3rq48TrRNhVaIeBWvsPePJMzVjqn8dLf/Yy27fp0rTJx3Ul6lwv23uKxkTamzKBRoqnjiWz+SXCUM68Arbs+LmBkFayUInvkIjEOBJLLR8yz1+Opgn9y+Ofre03VX+LqMudqAcBHsqE4lIsY39QGfr/aOjPlRHFZwBiRpX1/fXp85KbIIe3H7MevDmmOTkAKqcFNL1Rfdx8rT8MnJBizOFA5WoNcgUDYykHS7SCGrwtW66GJo8M1sAbr7bFhycSJMHSFcdYI4k7z4MzRe3bVyzqZAZAyQNeLxN1posE/mD8SDjclngmLmENmbouEXnC1ufV6P3EGnFKIlepS3QhLGS02FocjvW6QHybfyrlk+S99B1mAdKTs6gxdAv3I4lcVkus7S0GSCUePHU3/LsiNhtlcIVNR/YpUj12KIilRyyYc5/A50YAeq/3bCY5+KWhjwiJW+2FsHGhBkKvxY1t/yF9fXvm3dEXW5tDHG8tkHP+HyQysZQvpxSETYqhJUlfE15fAPuulGgFDpiew== X-Forefront-PRVS: 004395A01C X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(199003)(189002)(106356001)(7736002)(19625735002)(450100001)(305945005)(3846002)(6116002)(586003)(4001430100002)(7846002)(5820100001)(42186005)(45336002)(19580405001)(189998001)(81166006)(107886002)(81156014)(5660300001)(23676002)(50466002)(36756003)(8676002)(110136002)(46386002)(86362001)(86152002)(52956003)(97736004)(19580395003)(50986999)(76176999)(2950100001)(15975445007)(47776003)(50226002)(66066001)(92566002)(68736007)(2906002)(2876002)(105586002)(101416001)(33646002)(229853001)(122856001)(2870700001)(4326007)(90966002)(2351001); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0701MB2544; 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?MTtWSTFQUjA3MDFNQjI1NDQ7MjM6TGhaT0krcVl4eUhCWVQwbGgvY2FaNlQy?= =?utf-8?B?VnVTZ2ZqTkFXSEY4Z1c2c3JGVGQxVlhwTFIxMFcxaXRCb3MwYTE4UUlYTC9Q?= =?utf-8?B?TG9iajFrTWREQjM0UHNHNlRLYnM3V2xuWGpjb3dTQm8zaXV4QiswVTJjZUw1?= =?utf-8?B?dnorK2k5QURMQ2daakI3aGRzOExFdUNwNVowcmR0OTlETkl4K2NGM25OY2tL?= =?utf-8?B?bFEzR3FPSm9veDcxUXlISFBDTkFDdGdZVGk1RUlod0VRalZQc3BHMVBTbHor?= =?utf-8?B?SzVOTmNEcUxhSkFmQ0tpRWQ3M1NadlNhTU9EUDBKOGhmVHFpckZKenNTMTBw?= =?utf-8?B?ZU5TZlc3THNldXJZcE5QckZwQWFveWQzbU5vQUQ0U21ncjhBTEQ1VzZ3THpn?= =?utf-8?B?NWFFQ3B0S3lCUStsY2xPS25Pb3FHRlp0VTd4dEVBRU95ZTNPOHc2cTJVTW1i?= =?utf-8?B?aEZnWVUzSjRKUlhia1d1NGt4YWdOY3Z4aG5EU2d4SGcyc2xCSXdhNEVTNlN5?= =?utf-8?B?ZDJTMStrdkZTSXdDdFdaNU52NXJWeXFhK1Z5QjJramhZMUV1alYzcWxpVTRx?= =?utf-8?B?Z0ozVk9BUSs1YVJyb0pYZWZhTnQ0YmhmMTgycGZlQVVpY0R0L1RDWGN0VG4r?= =?utf-8?B?VTBnSGplSFpvdXhqT1JUWkhZVzAzSjdnNmY2RjUvemp6VnEvOVpqL21UQkVO?= =?utf-8?B?OUdGYVZ4eTM0Qmd5OFR1Rmlnd0NRZGJpclFiOHNZSnk4RFZRVDdqNHo2TFd5?= =?utf-8?B?MVpKYjIxYTNBVHFXcGJLZWlUUzljY2tFSGVkTm5keGNINXlOdGxHaFQ1QW5S?= =?utf-8?B?dm0wT0gzVGtqNjVDNnJEZnFlSC85MHFMRmRLRzhwSlBmUVA0MzMvVk85Vk9K?= =?utf-8?B?cXlxc29iOThuSm0zN2VOOUtLaFBoanlUWGR2cEhsbXBpem5tNjdpQUlpNWMz?= =?utf-8?B?UGNVTFZjQnp2NS9RUEllNi9ZVW1TZTVYOWhpdUV0TGwyV0RwcTNkSzRVcHlq?= =?utf-8?B?dXBETzdLZGx6VjVpVXgzdjdocVVMTjJ5R0dKZnFDY1VreHRkczdhdlRoaE1H?= =?utf-8?B?SGFqK1E4Y1JFTVFGYll3UmM3dVpQcnJranFxZXhFZGNBcUZLa01HSitqTERZ?= =?utf-8?B?aExTR01FZURydXFvT3Jtd09XN01aZitnSm5rV21iV3NrOW9VOWtKZVV4aDln?= =?utf-8?B?Q0NHRHdKa1d3Z1RtV05kOGNkaDhyemJsc2xWakF6QVlwQStFN00rMDlnYjJQ?= =?utf-8?B?TkcyMDAyV2ZjTWNrTEdVZ3FnNndJRm10bUh5cDZ5YWF3Z3dWT0s3amQraURB?= =?utf-8?B?cHUydmhjOG5mWFZ3NmNnSmEzY3BERTVUcEg3SGxRT3ZxaHNRdFcwV0l5dDJo?= =?utf-8?B?ZUI0dURWeU5kdldub2dKYVFVcGlSa2tWaVkxODdJK0hIOUdldjZRL3QwL3Bz?= =?utf-8?B?eTNob3IvcHlLQXduMVpOVzhZVU90K3FwR2FJR0E2RnM2NkE2eFFKZFhLVXlx?= =?utf-8?B?d2liMEdCMXVibnRaS1RuWlMyOS93Ymo4ejRqc2JMU3NRQmQwYjErNXlBSjNF?= =?utf-8?B?cjNHczkrdm5FU3o0Unl0TUFIL01JdTRwMG8zNlZGQXFMUnRnRzRycDZvTE5E?= =?utf-8?B?L0N5SWFIbVZaRUFQbjVtMk91TEtDWHpkbjA2T3hHemp5RXlUS1RUNlZBTjZ3?= =?utf-8?B?RnNFY05iYlJURnRLSSs2blVqS0hXM0tEM1BYR1Bhd1hBdzAvUS9qVzd6d0Fr?= =?utf-8?B?UmYxdEVLQ0JhMU9ndXc3QzRDQ2loSGRSWVBQS1FQZVh0R20xNUF4VnR1LzVn?= =?utf-8?B?UEhDNXZLMWtxUkloTTFVOVV4SUxnRWE4MGwwOUdmMGgzSVpBb3NIVkhtSEZk?= =?utf-8?Q?X95ltQFT2Fn4E=3D?= X-Microsoft-Exchange-Diagnostics: 1; VI1PR0701MB2544; 6:RkgedjPY0MAnlOHEM4GDrtlcmsyjecFupibQjq/TAxglooByfXKKJCltH9LwZfG5fcgxsUGY8rjxWrnDYJT1At31CH7fG8+quYrUKWNo/B2TXohNRlWRkIoxht1EWjhqlueNpCi5CKcIThB2tYj1KUxMHp1Dx+IhPxpaUHuUZs8C0lwx1W1fAbd+Xuct/7RICV7h9YXMsWMvtXSCnugWhoNVi2BcMLGrF0LSK68G3wd/qCXr7NvGGXsB+Zlp2cFLKp8hv+rnoxBtG45WMcr6SUIcIekFsS0tumHI8asbiM2yIAnp4L2O4KE4AUHO3ZKzbmbuSthCo0rzBzPDRFMdmg==; 5:lcMZy/w0TdV986F39wEMSfX53RSyy8lkz73KyIxwv0ZBskrNLwrvnGQznPlhkEl08fzZBTKJzVVUDxRVJfs8KUW6QhC4AYWIeL+/3eYuaGpir7S+bTSQaGIHe1JkvsoTzmS+KcLlwtNU//l9FXmpdw==; 24:FH0xBaTuHLVSjBRjsBoPmbjg7h1VEaScTuAg4eWD3py/nxBX8G35vOeu3+u3NbZ9GX8Iyy3QIsigdsct0fObI4xOAx7hQEv6NjoA/6EcyAs=; 7:cu+VX/eLnc4T/m6Ek208/jDGWKGW2CysD053xxasBiBQKqAbKNOfYrLmZVHREdoREru4lY9ZTd5Mmgcc12Yf+FHdRhsRwdYCIAcrBv2hRKZFIv4K3A6TL8SbUjSHV5C4yw0gaSu6Qb79IutVEhyt1qzS+ZiD+nXA/v0JDFKMkj4nFyO/qmVPqXNHooOXtJ/9jW/0fbZxq8aOe1S/rOW1P98UVYW3S0Ff6hx93CXy2kwlIUy15awiSjm/uP9pFa9/ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nokia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2016 09:04:09.5428 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0701MB2544 Subject: [FFmpeg-devel] [PATCH 08/21] libavformat/movenc: deal with AVMEDIA_TYPE_DATA by using AV_CODEC_ID_META 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" From: Erkki Seppälä This includes creating an AVCodecTag table ff_codec_metadata_tags as there are for video, audio and subtitles. The tag table is used for mov-compatiblity. Signed-off-by: Erkki Seppälä Signed-off-by: OZOPlayer --- libavformat/isom.c | 5 +++++ libavformat/isom.h | 1 + libavformat/movenc.c | 16 ++++++++++++++++ 3 files changed, 22 insertions(+) diff --git a/libavformat/isom.c b/libavformat/isom.c index cb457dd..1a90d00 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -355,6 +355,11 @@ const AVCodecTag ff_codec_movsubtitle_tags[] = { { AV_CODEC_ID_NONE, 0 }, }; +const AVCodecTag ff_codec_metadata_tags[] = { + { AV_CODEC_ID_META, MKTAG('m', 'e', 't', 'a') }, + { AV_CODEC_ID_NONE, 0 }, +}; + /* map numeric codes from mdhd atom to ISO 639 */ /* cf. QTFileFormat.pdf p253, qtff.pdf p205 */ /* http://developer.apple.com/documentation/mac/Text/Text-368.html */ diff --git a/libavformat/isom.h b/libavformat/isom.h index df6c15a..49c8996 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -33,6 +33,7 @@ extern const AVCodecTag ff_mp4_obj_type[]; extern const AVCodecTag ff_codec_movvideo_tags[]; extern const AVCodecTag ff_codec_movaudio_tags[]; extern const AVCodecTag ff_codec_movsubtitle_tags[]; +extern const AVCodecTag ff_codec_metadata_tags[]; int ff_mov_iso639_to_lang(const char lang[4], int mp4); int ff_mov_lang_to_iso639(unsigned code, char to[4]); diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 34bc235..c63fdc4 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1470,6 +1470,8 @@ static int mov_get_codec_tag(AVFormatContext *s, MOVTrack *track) } } else if (track->par->codec_type == AVMEDIA_TYPE_SUBTITLE) tag = ff_codec_get_tag(ff_codec_movsubtitle_tags, track->par->codec_id); + else if (track->par->codec_type == AVMEDIA_TYPE_DATA) + tag = ff_codec_get_tag(ff_codec_metadata_tags, track->par->codec_id); } return tag; @@ -2222,6 +2224,9 @@ static int mov_write_hdlr_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *tra } else if (track->par->codec_type == AVMEDIA_TYPE_AUDIO) { hdlr_type = "soun"; descr = "SoundHandler"; + } else if (track->par->codec_type == AVMEDIA_TYPE_DATA) { + hdlr_type = "meta"; + descr = "DataHandler"; } else if (track->par->codec_type == AVMEDIA_TYPE_SUBTITLE) { if (is_clcp_track(track)) { hdlr_type = "clcp"; @@ -4787,6 +4792,8 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) goto end; avio_write(pb, pkt->data, size); #endif + } else if (par->codec_id == AV_CODEC_ID_META) { + avio_write(pb, pkt->data, size); } else { if (mov->encryption_scheme == MOV_ENC_CENC_AES_CTR) { if (par->codec_id == AV_CODEC_ID_H264 && par->extradata_size > 4) { @@ -5301,6 +5308,7 @@ static void enable_tracks(AVFormatContext *s) case AVMEDIA_TYPE_VIDEO: case AVMEDIA_TYPE_AUDIO: case AVMEDIA_TYPE_SUBTITLE: + case AVMEDIA_TYPE_DATA: if (enabled[i] > 1) mov->per_stream_grouping = 1; if (!enabled[i] && first[i] >= 0) @@ -6103,6 +6111,7 @@ AVOutputFormat ff_mov_muxer = { .audio_codec = AV_CODEC_ID_AAC, .video_codec = CONFIG_LIBX264_ENCODER ? AV_CODEC_ID_H264 : AV_CODEC_ID_MPEG4, + .data_codec = AV_CODEC_ID_META, .write_header = mov_write_header, .write_packet = mov_write_packet, .write_trailer = mov_write_trailer, @@ -6122,6 +6131,7 @@ AVOutputFormat ff_tgp_muxer = { .priv_data_size = sizeof(MOVMuxContext), .audio_codec = AV_CODEC_ID_AMR_NB, .video_codec = AV_CODEC_ID_H263, + .data_codec = AV_CODEC_ID_META, .write_header = mov_write_header, .write_packet = mov_write_packet, .write_trailer = mov_write_trailer, @@ -6141,6 +6151,7 @@ AVOutputFormat ff_mp4_muxer = { .audio_codec = AV_CODEC_ID_AAC, .video_codec = CONFIG_LIBX264_ENCODER ? AV_CODEC_ID_H264 : AV_CODEC_ID_MPEG4, + .data_codec = AV_CODEC_ID_META, .write_header = mov_write_header, .write_packet = mov_write_packet, .write_trailer = mov_write_trailer, @@ -6159,6 +6170,7 @@ AVOutputFormat ff_psp_muxer = { .audio_codec = AV_CODEC_ID_AAC, .video_codec = CONFIG_LIBX264_ENCODER ? AV_CODEC_ID_H264 : AV_CODEC_ID_MPEG4, + .data_codec = AV_CODEC_ID_META, .write_header = mov_write_header, .write_packet = mov_write_packet, .write_trailer = mov_write_trailer, @@ -6176,6 +6188,7 @@ AVOutputFormat ff_tg2_muxer = { .priv_data_size = sizeof(MOVMuxContext), .audio_codec = AV_CODEC_ID_AMR_NB, .video_codec = AV_CODEC_ID_H263, + .data_codec = AV_CODEC_ID_META, .write_header = mov_write_header, .write_packet = mov_write_packet, .write_trailer = mov_write_trailer, @@ -6194,6 +6207,7 @@ AVOutputFormat ff_ipod_muxer = { .priv_data_size = sizeof(MOVMuxContext), .audio_codec = AV_CODEC_ID_AAC, .video_codec = AV_CODEC_ID_H264, + .data_codec = AV_CODEC_ID_META, .write_header = mov_write_header, .write_packet = mov_write_packet, .write_trailer = mov_write_trailer, @@ -6212,6 +6226,7 @@ AVOutputFormat ff_ismv_muxer = { .priv_data_size = sizeof(MOVMuxContext), .audio_codec = AV_CODEC_ID_AAC, .video_codec = AV_CODEC_ID_H264, + .data_codec = AV_CODEC_ID_META, .write_header = mov_write_header, .write_packet = mov_write_packet, .write_trailer = mov_write_trailer, @@ -6230,6 +6245,7 @@ AVOutputFormat ff_f4v_muxer = { .priv_data_size = sizeof(MOVMuxContext), .audio_codec = AV_CODEC_ID_AAC, .video_codec = AV_CODEC_ID_H264, + .data_codec = AV_CODEC_ID_META, .write_header = mov_write_header, .write_packet = mov_write_packet, .write_trailer = mov_write_trailer,