From patchwork Wed Aug 31 11:35:47 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: 369 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp328351vsd; Wed, 31 Aug 2016 04:38:11 -0700 (PDT) X-Received: by 10.28.209.134 with SMTP id i128mr20345419wmg.97.1472643491097; Wed, 31 Aug 2016 04:38:11 -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 j67si10163402wmi.35.2016.08.31.04.38.09; Wed, 31 Aug 2016 04:38: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 5FC33689B1B; Wed, 31 Aug 2016 14:36:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30106.outbound.protection.outlook.com [40.107.3.106]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E8008689A78 for ; Wed, 31 Aug 2016 14:36:04 +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=4ZbKF6pd3dMVBZ49o787rVZkvh+BDoEeIVpnkOUQCjw=; b=hAW8E+oiruL54gWfBSswowigEWq/x0Al8SygY0tVWkYZUHNuE6goWYxfJGj0h+8Yp7qlHb/zNH5bpRIuHJxj3JRDHY3bHvbbJmzcbVmSlDQFEe0VAf47+mCmOCeWcISFO+ORlnYhqbUhJhfL5w1Pd1JJ34cWfDyR0kEf9MlUCsw= 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 AM5PR0701MB2530.eurprd07.prod.outlook.com (10.169.153.150) 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:05 +0000 Received: by erkkise-laptop.vincit.intranet (Postfix, from userid 1000) id C74874CB946; 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:47 +0300 Message-ID: <1472643361-10118-5-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: VI1PR0901CA0065.eurprd09.prod.outlook.com (10.167.203.161) To AM5PR0701MB2530.eurprd07.prod.outlook.com (10.169.153.150) X-MS-Office365-Filtering-Correlation-Id: f37487ea-a409-4999-5f79-08d3d192fe4c X-Microsoft-Exchange-Diagnostics: 1; AM5PR0701MB2530; 2:YIV+DlIWU4aFq9ywdK3vrIQe4PXwo+136K4TXD1eId7Uq3ilXwMVxSS1brto8knnNJZ8YZG1OAnIJ8DvGKAoQShtLnoW22/OEcjTFTcRToJq3P2ntn8Gisz1LZhiRkp4JpKBJLAN6Ec2WaPLmR1Hr9STai8JdN2FkuJbXA1FWYoEt3vJho/XwlIxsOfjpfCD; 3:Kqp0lxnqUcAbD0idkFws2frCSTdiGIs0S1EBKx/ngKcCujl5Qq/rRJnEKn8n3rcsNs4uF1AYnRKMPLvy3jIEPaKPTuh/vJZBjPDxHl8oBKWAULz58Z8kkyXnXuZRUL6E; 25:G2JV5fcBP854eEnQ8KwHFeGIeRvyz/zcGlSDJeqxoW/VXJ4EznBH83DWnE3cSuvFtZ2ZU3gpG62kVFF4oSc/icXluKdKXuWysN29n6W7z/9JNek79ebU77xjrJ6IE1k3FQswUymkCgZExVKS1u6fzPDXiomy8KVo5urXm0gjiKUh6lC/eNoYLx0KH0VnWV7Ej3dwVAF3vWtKKY2gbdRwoQKxHqqiOyi+bHmKFelxn2WNP9vGcJZHmBcIliM8TzwjACiWK3WiTjbRHg4ue7Ktn9uvowvr04OBh8K1eb7YgzBhOwMikDCRydBrtka1RdwdRBtl5LICUmIQdfj8phTEp1+Wt4g4Adn0/fFSzsnfni4usXqNYcy+nUt1qA2A+FUXpUITzyRv07jMtn6B6KtnQgjcioCv1OIEcijzJ9xMkGo= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:AM5PR0701MB2530; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0701MB2530; 31:pMuNFUSTobb7BpRXJlw3AQbQWgGt8roZaO95Sdt7VccFeNaBBzJh9/y0gcZpqR8bhqVEK4z6hKJZrZBhPpKztjml0/iECiDGvsn8+HcQ9DEhOsYG3aUNl+BcRG2wHboA8eKKaj0G9rLpgP17GiaL0fM1Q8LDV2jhThTH/6D0S8pupPhk6zzHcaKx9xIk+xOTf6CDppWNE+HQysuIetCBy8gtFS0Hyqm1Nl5rCn6kNOA=; 20:uNfEDNHT/3uKkJ6S6NgZJ3DN5zntSz/2ysC9oDvyA4VZkFG+4ECQiSP6+hAnnbXYNgRctYqY7kv8AaxOlYgiKdoWk1CkyxbH9lHgm3hOVr948lZR55HYSRioTpj6HfI+ChAWMrNvJLv8En8FY7MdPEJq5lLWk4TNIpA9lwV6BYpAhgBMmyW7i2BRVcyQlxLAXtlESwOqNDIVCDcxHGp3CB8p04afvPEYqhfSl7dJ2fKNeAgUDE/FuQwuaVPSOf93Ir+WKiIR/ue/pvmJMlnjnLIrfwEewF5w0cyj6Yj3W9soT/UP/nLPasuwCe2WlQ/gWRWz0ODZ9f0M9QRtM79RNChwxE2Uc5Jbg2fxZ2oKGzoF4boxWSWoaF8NKefBmaV5yFi60UzAf3JGqKk1sEzn6vzFbWrwJqrfNgJoiV8ADQ20hA406AO7PENzBgHSWDdAaWnP8Ns5a55n5Wc7ZwY3j8YypQO2GpVxqXYH8FlrX/gtrGq9HA6DhOIK2PZfHpcs 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)(8121501046)(5005006)(3002001)(10201501046)(6055026); SRVR:AM5PR0701MB2530; BCL:0; PCL:0; RULEID:; SRVR:AM5PR0701MB2530; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0701MB2530; 4:TkyPAKwGxEkiQV3fcl1fxsxa/iEkeD5Nrz72ZEUCclszXRq4sHbXlM9aNj7olghJBbJLBJ7YXVgIPQE8SUUiJxBW0KuluxcE19Fy6S214VHoI46eshSJdrj4DNVdd0ytMADC9AKii70FhV5ExLP5hzkfz56mXPIfjDBOpnVoz7WoC0Z1p15RBqxNOnLbz2ttuDjymvaaIRu+vrm2pVPC4idN3sPo/+TERexXprZpSkRgG4hvJyTjU9Qvtm5TYSlFT46LeuAtnoOnw5spjN220DuMGRISovn2iYlNwevnhDmz2JT8XmteyrL9eEdgsksh3pnMu8tIp3pBVxsXZNg2zuTe3hLJKSfNDde8eYeJ9J5jmcI+7nMq4ludRwJdRIZpgZGO82aVuJaYXctGLgU6XoDKbDIKvzyYWYEgOnw/duMV94EVD/LVNBu0h+O0Yy9RH4rTkOqxyATxJK+5hfvlqlsJ5vBsoWoKTzs/ymMVqTvRaRvODNzIpmIX+EHdO1yz/jJeGDzAN23KbGYbEh8bsg== X-Forefront-PRVS: 00514A2FE6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(305945005)(50466002)(66066001)(97736004)(122856001)(5660300001)(45336002)(2906002)(50986999)(42186005)(76176999)(105586002)(5820100001)(50226002)(46386002)(23676002)(110136002)(2351001)(52956003)(8676002)(101416001)(19625735002)(4326007)(189998001)(2950100001)(229853001)(2870700001)(450100001)(86362001)(92566002)(6116002)(81166006)(19580405001)(3846002)(4001430100002)(68736007)(15975445007)(81156014)(47776003)(586003)(107886002)(7736002)(7846002)(90966002)(36756003)(106356001)(33646002)(19580395003); DIR:OUT; SFP:1102; SCL:1; SRVR:AM5PR0701MB2530; 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?MTtBTTVQUjA3MDFNQjI1MzA7MjM6UmtEdmRmYi90bkFnbHN1bkV6UjR3bGZB?= =?utf-8?B?ZkRFWHJOdzlvaXlkYm50TWRjeTUyQTd5ZDVCVjZnVUd2WWxIYUNLMy9JdVJD?= =?utf-8?B?U01rNVZNVE43c01udzF1NzVibjNOMGliRWt2Q25XTW1nYmVLVmNYR2UvSlZ3?= =?utf-8?B?NUR4eG4vQVM2cHZLVElXSDJFZ2E5Yld6Z3dMQ1JSWEN2bFFJOWw1dFQwMnhO?= =?utf-8?B?QnJXRElYeUxUb1ZhdjcyUjYza2hEYm1GemNON1JTblFuZVR5VEY2Y256djBk?= =?utf-8?B?blNnTDM3bytuLzdscFE0UFd5UUpHZmR2aHNhSDQwSlBBL2IyOTRyTkovM3Uv?= =?utf-8?B?YzFreERnclkwQk15ejk3eUh3MlhjeE5qN3RXaVBKNitTNTZWNnVZU1djYjVz?= =?utf-8?B?RzRjeEpPRUhuTlVlY25zTlR6aFZUOW1RaEZvSTdBeGNJZUcyT3BFOWtmZjJj?= =?utf-8?B?R3FMU3FyRk9xUkY0enZnLzJWZjR0VU1NKzBqTXdvMXBFeGltVEhkYUJ0MDdh?= =?utf-8?B?UG01VmlkdllRUENFbUZQQjBOaVJSZWZKamQzUnZyUU1KcVA4V0FjRGUybzMz?= =?utf-8?B?alMyVERLbjRuWFU5OXNTRFdSbVRNMUV2OFVBd3ZKUWRYRi9WdE9LRFFoc1lI?= =?utf-8?B?Y2dlT1NkdlhIWmwvUlVlSC9kTTFRSjAveDRUNDR5ZTZxUk1zWkdSVEU1bFZh?= =?utf-8?B?T0JIYlZFcE9VZlFSNXZrQld1V1RheWp1YXNubXJtUUZ1SzdZN241bmVUQWh3?= =?utf-8?B?TkgvMi9wN0krdExvNm5kSWdiU1lrWlJCT3dwM3BZR2xjZEF1NUMxdUc0dHRj?= =?utf-8?B?bXc3ZHBIb3BGTG5kL2kyN3lSN0x3a1NZaGhVdXEyQ0hRZjV4TlhRS2xDY3Fm?= =?utf-8?B?UHU3NTl4UVoyUld6Z0k3ZDlUQjJDbGJ2N2VybWpXNm1xbVU1NFgwQi90RjM1?= =?utf-8?B?ZE9jVmZQQTB2anljNzQrTDg5bW9DajJIckh3RVZVNCtDbnAzVk9YRFpiSlZv?= =?utf-8?B?c09RalVSS2RvYis2dkJWWSttT2VkclVUeEpEYWRyNSt4Uk1tQmFEbXIzTTN1?= =?utf-8?B?Q1VTdEp2cml3eHFVYVRwM2taZzZxNU1JSER0NThGSXBVeDlQNE11NjdWNUE2?= =?utf-8?B?T3h1NkVRZGdLL25ob2ZrMnVkU2RWdEhRK3Jsdkg1YVlRV3Q1NUY3NW00dEIv?= =?utf-8?B?cElVbEJZVER6SFNJTk1lRzBtQ09UUkJWQzJzcTdPaERIWGFOSVBrTGNmRy9m?= =?utf-8?B?Z0tqZU9JWEFnWnhJeWNKNVFNeERRdGY1eTNDUlNiU1JUMWhKZllKN2JON1Zh?= =?utf-8?B?Wjh2em5Id1BVdWJseS9CZ2kzK1RYVUxyOVRGbW9nVlIyWnFCZ2NQcHRTcWZE?= =?utf-8?B?Wm5YZGswaE9UOE5RZDRORXFlWmpranNZb2UyRXlEWVg0L0l1RUlERXd1aHFz?= =?utf-8?B?MFcvNDZYVWRnc3c3aVJNdnRaR1h6LzhrYkp6bGhGanpDMXU5V3Z3QlprdVlV?= =?utf-8?B?OExFMWEyY2xaVVNUdHRSQ3pmdFkxVDVSdXVka01WdFNFVEpsaHBKRWRmSXhj?= =?utf-8?B?bEdZV2M2aGtyeHBJSXBqeVovNEVjMlgzUCsxN0Mra05hRVIwWkJKa1UvcXVC?= =?utf-8?B?ZFYxT1RHNFFVZ0lmZjJqRTlMSkhMVi9QclQwSzltenp0bkxRaG1lVFV5aTBW?= =?utf-8?B?ZE1qc2NzU1hycVBOMzg4Ni9LQXJLVjJudnNFUThYN1JGVnJEUUtMc0RPQkZC?= =?utf-8?B?cVF6anlTYlJ2dkUrQ1JCVzJFTjBBVDlSWEg0NTZrS0NNNFBXSGxGcmlCbmV6?= =?utf-8?Q?vR3ool+lquF1Z6a?= X-Microsoft-Exchange-Diagnostics: 1; AM5PR0701MB2530; 6:pFs2TyOSnWM6M5349QvK8Dz6xQavG0JPJaZ4HL8bUX9ItT0vz4IuhQbINwovAzE8Fvk9jjRVXBX4HEeq7bci8znHJXYGMTsxbgY9PXxoSYGElR7A+Ct0Daf+k6fztz+BHHlXdX5Q0DuhzhGYzBuPL7Wj28rr6KqX0FZzB9bkJodnPLafcLGVKuS5pVn4dTjvesfeXAnYJqc71gt4sgdABaiy0GkqX5WvUYYTXoP/A3UA2wkxQz4j3+Mi8H1gHYCM9pCGy1bZWAwv17CNycQGsZY9WZH03kqgmMvzNNobfHlIHg3oaHBRgRyI2bh2mBbDcaf2dVafhaV/e11/Fj64Dw==; 5:tvcj1Dp2qg59Y6gy/K0kFlC3Z7qx4ya6nhCINL30u5ziIMj8EQP8BQiaAyxvSBaZ+RO0vcOCHoCQK5dvNB0nDuZ8VYJBeoIcmijNte7Ig0+CHdADzB0Qhv8I9ip9aO/1bZY90eX2iS2Ah8idVtd/IA==; 24:ZAPRKvpfCfoGlI0CjcD7vjXnckF1LpDwRhR6GXF/8HN9IXo6sK79u+oQ0R12pSznfwlVWVL9oBNQvwEXWrsgOZ9S4+dE9ko7J7FxYBuGQTA=; 7:DPPgpAleRrs3jVZ0EYURes7Kc7Bm5AAdhdnlhdqlXuFLD1YCi+JoDbBrvTgK/dqPJxBpyvMhBrKmQrd6F2muVO7qq55rJcAIYCt32+CDKRNnWnTDWYgeYcsXczThqfbqsJNA0Apb+wqgbblLF4SkH8ut7N4HWI5KUfgahQv16GQdj8Pu2bPWZXiS4gi0+g+NMfE4S91L1q3xrMNMiA0d9t2/gajB5bVObeN9HFUECwS2at40FZ2sb8unbaLliR+Q SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nokia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2016 11:36:05.0499 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0701MB2530 Subject: [FFmpeg-devel] [PATCH v2 04/18] avformat/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" 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 | 14 ++++++++++++++ 3 files changed, 20 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 571c2a7..f02458b 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; @@ -2242,6 +2244,9 @@ static int mov_write_hdlr_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *tra } else if (track->par->codec_tag == MKTAG('t','m','c','d')) { hdlr_type = "tmcd"; descr = "TimeCodeHandler"; + } else if (track->par->codec_type == AVMEDIA_TYPE_DATA) { + hdlr_type = "meta"; + descr = "DataHandler"; } else { char tag_buf[32]; av_get_codec_tag_string(tag_buf, sizeof(tag_buf), @@ -5308,6 +5313,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) @@ -6110,6 +6116,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, @@ -6129,6 +6136,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, @@ -6148,6 +6156,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, @@ -6166,6 +6175,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, @@ -6183,6 +6193,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, @@ -6201,6 +6212,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, @@ -6219,6 +6231,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, @@ -6237,6 +6250,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,