From patchwork Wed Sep 4 20:43:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 14911 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id AFA7944A6AA for ; Wed, 4 Sep 2019 23:43:10 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 903BF688061; Wed, 4 Sep 2019 23:43:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM04-BN3-obe.outbound.protection.outlook.com (mail-oln040092009098.outbound.protection.outlook.com [40.92.9.98]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E2052687FD6 for ; Wed, 4 Sep 2019 23:43:03 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Eyq27wAHHvoTXDPsntRGtNQpJGcrInflkIqxHwXPudpIiAZvNCkoMaSTWjx8H3atHgrBvbChgAxoPAUVopq0Sa5pVVf+sr7P1Ae59DD2ESwrydT6znEGcWHEfjL5kgKQL0DXdbSWUKEqU4GR7mSLifeOf8ubSsy8NnAy/7AL1xQqfLpnYL7ex51j+D3IvZUpzp55CsxF5K+Hn9djKj+sSxvUqISV0NxuzZvwa6TtMU01AwtYuqjtSTaivwS2gqlbXhQix+W+l1fZXZ2pRFKRgJ+SduiSoPIxexnziw+0wjRl4xuAIQyHo0MRCqlDN+tpgjzKVGStlXr/FjCVw0V1fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=D9JSxw4JHruCn2iG4j4fE6u6+Gp8VKzv52CUqeQXbwE=; b=Q9Mib1Dg17W7Ib92Bb0uTCzlZpnvCwaKaT61n/EOK3u18UgwdAFq3LR6/HV9D6jbOHNpOvF48ea7KJeriCa+mEDoGGm1dVg4YKOR40UsWQFLgdnZvn7ipXbOCv+qSaSpM6e6Kht76x3rMQj3mKzPk3JeNo5Vk+USRyHX1iEZukx438HZ68nGJ5YDfxtpfhi4l/Yq7BXTaZExjpbkQIvZdN1v5OprWlPeshI1yFWOVo42xM+w2nyBob3b3FN2GS4fgA6E/NA438bVuAx4mLtYeBkLh9vBGVZ7phhhJRcinNxF5TOF4Hn0ueck/tFflVjtIlhd5LWEhncvcgbuv/Gq0w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=D9JSxw4JHruCn2iG4j4fE6u6+Gp8VKzv52CUqeQXbwE=; b=E8JpDpLKMrwryECtr5eNIKR+atjSlqvb1MCQkGzsGPDeYTbAJtKc85kZfvuEa8ykhqE/WRuy3ErDoEk9Crq14xtp6SVeonRLB+Jg+CWlXYAAaOrq2kyJzub3IDBBfPc8WZLwVSmx6Ft4HhLU2LWOlf2AQxwSmMs1Pm+5F+j0AVqu27gK/rGwKoO6Gw2Pw6fP1HUia4OuDGnB5IgXhOy1e+iSB8IOAgaPSGABQGpNtFiphHpiuqBqeB1bPP9XhxbG8e0NyKB5O37RiO55gZbNv958sTni3t+nAyjd1sLvl5UGB/AxU+aOPgMGaT6mnMBOhy2xTwon4DAO931S3dLWRA== Received: from SN1NAM04FT049.eop-NAM04.prod.protection.outlook.com (10.152.88.58) by SN1NAM04HT017.eop-NAM04.prod.protection.outlook.com (10.152.88.240) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2220.16; Wed, 4 Sep 2019 20:43:00 +0000 Received: from MN2PR13MB2752.namprd13.prod.outlook.com (10.152.88.53) by SN1NAM04FT049.mail.protection.outlook.com (10.152.89.160) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2220.16 via Frontend Transport; Wed, 4 Sep 2019 20:43:00 +0000 Received: from MN2PR13MB2752.namprd13.prod.outlook.com ([fe80::9c2c:8444:38e1:5d6]) by MN2PR13MB2752.namprd13.prod.outlook.com ([fe80::9c2c:8444:38e1:5d6%7]) with mapi id 15.20.2241.014; Wed, 4 Sep 2019 20:43:00 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] libavformat/webvttenc: Allow (but discard) additional streams Thread-Index: AQHVY2E0yBDruMybtEWcgJrvew6xQw== Date: Wed, 4 Sep 2019 20:43:00 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: x-incomingtopheadermarker: OriginalChecksum:57F31E81F2C3E0B15D326887C28F0AE9311320F9DFC0E2E5357E9C53BFCC305F; UpperCasedChecksum:14C08875123C902DB31E757C9A1E83B0B9DAA04733CE87B67E40DFD904CE845F; SizeAsReceived:6568; Count:40 x-tmn: [7kFCnQeMsjryybZLOmayMJmgemuDbvNa] x-ms-publictraffictype: Email x-incomingheadercount: 40 x-eopattributedmessage: 0 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(5050001)(7020095)(20181119158)(201702061078)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031322404)(2017031323274)(2017031324274)(1601125500)(1603101475)(1701031045); SRVR:SN1NAM04HT017; x-ms-traffictypediagnostic: SN1NAM04HT017: x-microsoft-antispam-message-info: YyuRaNg9I/trSb1SWquDTtp248B9edhLcVhvXM15ntPb51Kh2ttLGAcfwOmwocU8Ku3ym0eXFp31YmcJoOAzBWzkLK41Y7Q53C1+x+UR8S1nIT+Sn7bir+Dl7zcF0m24V9/sQ2Dt0gB6RnE1MzfabhHYUrGbK9i9MF1jQcVlsjubBxtup9GxDHsI66VK7h5t x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: hotmail.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: bc0e2c6f-2c7a-4dec-6cf3-08d7317879a3 X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Sep 2019 20:43:00.1845 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1NAM04HT017 Subject: [FFmpeg-devel] [PATCH] libavformat/webvttenc: Allow (but discard) additional streams 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This allows having a video stream as reference stream when using the segment muxer --- libavformat/webvttenc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavformat/webvttenc.c b/libavformat/webvttenc.c index 61b7f54622..be85c03130 100644 --- a/libavformat/webvttenc.c +++ b/libavformat/webvttenc.c @@ -49,8 +49,8 @@ static int webvtt_write_header(AVFormatContext *ctx) AVCodecParameters *par = ctx->streams[0]->codecpar; AVIOContext *pb = ctx->pb; - if (ctx->nb_streams != 1 || par->codec_id != AV_CODEC_ID_WEBVTT) { - av_log(ctx, AV_LOG_ERROR, "Exactly one WebVTT stream is needed.\n"); + if (par->codec_id != AV_CODEC_ID_WEBVTT) { + av_log(ctx, AV_LOG_ERROR, "First stream must be WebVTT.\n"); return AVERROR(EINVAL); } @@ -68,6 +68,9 @@ static int webvtt_write_packet(AVFormatContext *ctx, AVPacket *pkt) int id_size, settings_size; uint8_t *id, *settings; + if (pkt->stream_index != 0) + return 0; + avio_printf(pb, "\n"); id = av_packet_get_side_data(pkt, AV_PKT_DATA_WEBVTT_IDENTIFIER,