From patchwork Tue Feb 28 19:45:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 2702 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.149 with SMTP id x21csp1600738vsf; Tue, 28 Feb 2017 11:46:31 -0800 (PST) X-Received: by 10.28.13.80 with SMTP id 77mr256031wmn.88.1488311191629; Tue, 28 Feb 2017 11:46:31 -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 e10si3660690wra.213.2017.02.28.11.46.31; Tue, 28 Feb 2017 11:46:31 -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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 91A036891E9; Tue, 28 Feb 2017 21:46:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-qmta-pe01-3.mx.upcmail.net (vie01a-qmta-pe01-3.mx.upcmail.net [62.179.121.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0395C688254 for ; Tue, 28 Feb 2017 21:46:13 +0200 (EET) Received: from [172.31.218.31] (helo=vie01a-dmta-pe01-1.mx.upcmail.net) by vie01a-pqmta-pe01.mx.upcmail.net with esmtp (Exim 4.87) (envelope-from ) id 1cinj5-0003UV-2x for ffmpeg-devel@ffmpeg.org; Tue, 28 Feb 2017 20:46:23 +0100 Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.87) (envelope-from ) id 1ciniz-0001Vk-8I for ffmpeg-devel@ffmpeg.org; Tue, 28 Feb 2017 20:46:17 +0100 Received: from [192.168.1.3] ([80.110.115.245]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id qKlk1u00j5Hkk6g01KllUy; Tue, 28 Feb 2017 20:45:45 +0100 X-SourceIP: 80.110.115.245 From: Carl Eugen Hoyos To: FFmpeg development discussions and patches Date: Tue, 28 Feb 2017 20:45:44 +0100 User-Agent: KMail/1.9.10 MIME-Version: 1.0 Message-Id: <201702282045.44470.cehoyos@ag.or.at> Subject: [FFmpeg-devel] [PATCH]lavf/matroska: Support codec id V_FFV1 for FFV1. 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" Hi! Attached patch fixes ticket #6206 here. Please comment, Carl Eugen From 10caa3898fa76f5a76dce7e3795a7a0d475870c1 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Tue, 28 Feb 2017 20:36:12 +0100 Subject: [PATCH] lavf/matroska: Support new codec id V_FFV1 for FFV1. Fixes ticket #6206. --- libavformat/matroska.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/matroska.c b/libavformat/matroska.c index fda96fb..7905fd1 100644 --- a/libavformat/matroska.c +++ b/libavformat/matroska.c @@ -77,6 +77,7 @@ const CodecTags ff_mkv_codec_tags[]={ {"S_HDMV/TEXTST" , AV_CODEC_ID_HDMV_TEXT_SUBTITLE}, {"V_DIRAC" , AV_CODEC_ID_DIRAC}, + {"V_FFV1" , AV_CODEC_ID_FFV1}, {"V_MJPEG" , AV_CODEC_ID_MJPEG}, {"V_MPEG1" , AV_CODEC_ID_MPEG1VIDEO}, {"V_MPEG2" , AV_CODEC_ID_MPEG2VIDEO},