From patchwork Sat Sep 22 00:42:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 10435 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:1286:0:0:0:0:0 with SMTP id 6-v6csp41735jap; Fri, 21 Sep 2018 17:42:39 -0700 (PDT) X-Google-Smtp-Source: ACcGV62tCzUilvIzNEWDAPSscY0R3vqn8wUx4KB6CeqARF5/a3UQQK2jTr3myGSEqkmPUi6o381J X-Received: by 2002:adf:b2d7:: with SMTP id g81-v6mr155346wrd.48.1537576959704; Fri, 21 Sep 2018 17:42:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537576959; cv=none; d=google.com; s=arc-20160816; b=LBWGMw167TxK+o00pPNBnVflp5x/zmWxtIRQ61ssqfO5AnQmxXvwgB3hoMpvDO3N2K Ay/6DKSV/ZjkfcSmQEOnghCvWRbrZiIajmD9Uzj5uhoyqAuTxbWsrO0DNEOfU2hJ6pwU cx5J4e6M9yFqKFB+rPRFZqf2GCHyEaHO8YrlePyK3vReIhOrv5BU4JBwoNpX301OOwSG ycMnBLNZ+z7BGUcpTUQniM1Iu2pKDuHwGa4hWm4265gFGLBd/LbEBVtHB7NlZRCBCeGY Ig6droO306arPl6xNo4k4GBAkmAig68qTcGoTS5igwA5GPMmlZX+hfo4CebVrIXWNSnT eGig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=jfa0Pic1v6vqsm6sqqEgKDTlE8zxG7oqcTzYujQ4v1U=; b=aY7tpoyR0dMrosqu6AD68RGwU5NiYfXb5UAG9sQYisK40uZIWWKg5w5qxLElw+O0+g CfhyUoGBJSzjq6YK43ljBs62KXxkx6rcOA5R4YDdXAiAfNkogcHS21VJvnrH10Qb2drL rolf868uGoR/ONlTVHIPLfgIiCbjwroY3JA18crk6vNzCSaEzEkn5Y5l2xHZZF9xrh2t UjTpQoAzHN5KheandzWkc+gRi26kllJFsycm5k0o32qQUiEMUc4Z1J/3dzXwOZJe+vYW MtPpy2ePGFWv9G3U/ifZPYXF5s62aTiGzx/uS1wsTMjnfuEdbnoj3M/pMxqDOG8MjL0Y OWRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="uZf0L/EG"; 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 sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 198-v6si7385894wml.114.2018.09.21.17.42.39; Fri, 21 Sep 2018 17:42:39 -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=@gmail.com header.s=20161025 header.b="uZf0L/EG"; 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 sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A121168A6D8; Sat, 22 Sep 2018 03:42:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f196.google.com (mail-qt1-f196.google.com [209.85.160.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7C1B768A67C for ; Sat, 22 Sep 2018 03:42:17 +0300 (EEST) Received: by mail-qt1-f196.google.com with SMTP id l16-v6so3042519qtq.10 for ; Fri, 21 Sep 2018 17:42:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=S7v7wz2tegVRTSX+rRH6fyScHtAi510JMq8QoieXT/E=; b=uZf0L/EG4S3fkNFS7yMH7AEGESX8btPPQePa85Z+fcTDG6gZvsckGqnl5xMr3eKfeh b5mzBHWxJkCNxTSrgw2JUHrxeeM8DVKKn+myU1AWeoJWEkDE3rD1J4NuJWz0LwmQR0Sy zfTSIFlKGpMZv2qZ5leEr2Big53bLjHUE1SgOf354+oWWfYfjttiPcppwnVf21ws5c41 Ue3NrYIRexQkLPGGWeZhadY/ojKoxXT0dBpj/AAmPC8FIqcBJrjwrDq3inCntv48RgPt s1S4o/H17dsH5qYYcKlLC1H0cp3wojs2lh5wz3ZsGid9DC2WPRUIydW7yIAowIzSfx5F wESA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=S7v7wz2tegVRTSX+rRH6fyScHtAi510JMq8QoieXT/E=; b=ZM4KigySWqiAT0IXJrlsLyVWUuwAX1edQ602uduKDsY2negwCVKeo6AflA9akheWL3 Fyj2/XsGIHLyQopc2Elg054YNbzj5zk61az8zZFIOEG0EodLKsqT9K/yHj1O06e+Po/h KNV8waqj5mpUP1fPwMiF2UKupbVdMRhjB5L8g8Ut7dJK7UAyrZT8Jai0/Lz2Y97WfEUq FYs99JNux3V0T/k9xbOjkEbTp8iIRWMt3L1+zEoH2UmMa6lqBaAJhspEwE5RJViarhhv tn/8TjwS2G31Hr9Fxuntmm6QtOzoaPJdiWXT9SvnFsK+1XXzDP96/50zC8S/6YANgTb5 NHgA== X-Gm-Message-State: APzg51AhnAkXT6txVJ9NBNCb2HH4jU17JXisjZ7xo8djuZq1A1Dclnrm wZzknjPEKarPPvCZ4lODSDn1K+9a X-Received: by 2002:ac8:c86:: with SMTP id n6-v6mr139594qti.324.1537576950936; Fri, 21 Sep 2018 17:42:30 -0700 (PDT) Received: from localhost.localdomain ([179.38.139.56]) by smtp.gmail.com with ESMTPSA id u184-v6sm17095750qkc.87.2018.09.21.17.42.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Sep 2018 17:42:30 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 Sep 2018 21:42:19 -0300 Message-Id: <20180922004219.1648-1-jamrial@gmail.com> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20180921212922.8836-1-jamrial@gmail.com> References: <20180921212922.8836-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 6/6] avformat/matroskadec: fix CodecID for WebVTT on Matroska 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" D_WEBVTT/* is only valid for WebM files. Signed-off-by: James Almer --- libavformat/matroska.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libavformat/matroska.c b/libavformat/matroska.c index 4d18d147fc..88575656c0 100644 --- a/libavformat/matroska.c +++ b/libavformat/matroska.c @@ -60,11 +60,7 @@ const CodecTags ff_mkv_codec_tags[]={ {"A_VORBIS" , AV_CODEC_ID_VORBIS}, {"A_WAVPACK4" , AV_CODEC_ID_WAVPACK}, - {"D_WEBVTT/SUBTITLES" , AV_CODEC_ID_WEBVTT}, - {"D_WEBVTT/CAPTIONS" , AV_CODEC_ID_WEBVTT}, - {"D_WEBVTT/DESCRIPTIONS", AV_CODEC_ID_WEBVTT}, - {"D_WEBVTT/METADATA" , AV_CODEC_ID_WEBVTT}, - + {"S_TEXT/WEBVTT" , AV_CODEC_ID_WEBVTT}, {"S_TEXT/UTF8" , AV_CODEC_ID_SUBRIP}, {"S_TEXT/UTF8" , AV_CODEC_ID_TEXT}, {"S_TEXT/ASCII" , AV_CODEC_ID_TEXT},