From patchwork Mon Feb 6 07:41:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petri Hintukainen X-Patchwork-Id: 2430 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp1670404vsb; Sun, 5 Feb 2017 23:41:18 -0800 (PST) X-Received: by 10.223.138.188 with SMTP id y57mr7969984wry.191.1486366878866; Sun, 05 Feb 2017 23:41:18 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f4si7019553wmf.139.2017.02.05.23.41.18; Sun, 05 Feb 2017 23:41:18 -0800 (PST) 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; 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=NONE 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 61E31689B08; Mon, 6 Feb 2017 09:41:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from johanna4.inet.fi (mta-out1.inet.fi [62.71.2.203]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AB252689A67 for ; Mon, 6 Feb 2017 09:41:06 +0200 (EET) RazorGate-KAS: Status: not_detected RazorGate-KAS: Rate: 0 RazorGate-KAS: Envelope from: RazorGate-KAS: Version: 5.5.3 RazorGate-KAS: LuaCore: 215 2015-05-29_17-31-22 60ae4a1b4d01d14f868b20a55aced8d7df7b2e28 RazorGate-KAS: Lua profiles 78662 [Jun 02 2015] RazorGate-KAS: Method: none Received: from localhost.localdomain (80.223.124.214) by johanna4.inet.fi (9.0.002.03-2-gbe5d057) id 5894632C006B2CC5; Mon, 6 Feb 2017 09:41:08 +0200 From: Petri Hintukainen To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Feb 2017 09:41:03 +0200 Message-Id: <20170206074103.6322-1-phintuka@gmail.com> X-Mailer: git-send-email 2.9.3 Subject: [FFmpeg-devel] [PATCH] matroska: demux BluRay text subtitles 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: phintuka@gmail.com MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/matroska.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/matroska.c b/libavformat/matroska.c index c8e5341..fda96fb 100644 --- a/libavformat/matroska.c +++ b/libavformat/matroska.c @@ -74,6 +74,7 @@ const CodecTags ff_mkv_codec_tags[]={ {"S_VOBSUB" , AV_CODEC_ID_DVD_SUBTITLE}, {"S_DVBSUB" , AV_CODEC_ID_DVB_SUBTITLE}, {"S_HDMV/PGS" , AV_CODEC_ID_HDMV_PGS_SUBTITLE}, + {"S_HDMV/TEXTST" , AV_CODEC_ID_HDMV_TEXT_SUBTITLE}, {"V_DIRAC" , AV_CODEC_ID_DIRAC}, {"V_MJPEG" , AV_CODEC_ID_MJPEG},