From patchwork Tue Jan 10 16:23:04 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: 2174 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp335937vsb; Tue, 10 Jan 2017 08:23:15 -0800 (PST) X-Received: by 10.28.18.134 with SMTP id 128mr2272702wms.53.1484065395682; Tue, 10 Jan 2017 08:23:15 -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 e9si1873652wra.151.2017.01.10.08.23.15; Tue, 10 Jan 2017 08:23:15 -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 EDB1168A4D5; Tue, 10 Jan 2017 18:23:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe02-1.mx.upcmail.net (vie01a-dmta-pe02-1.mx.upcmail.net [62.179.121.157]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 74BE9680872 for ; Tue, 10 Jan 2017 18:22:58 +0200 (EET) Received: from [172.31.216.44] (helo=vie01a-pemc-psmtp-pe02) by vie01a-dmta-pe02.mx.upcmail.net with esmtp (Exim 4.87) (envelope-from ) id 1cQzCT-0000Gi-E7 for ffmpeg-devel@ffmpeg.org; Tue, 10 Jan 2017 17:23:05 +0100 Received: from [192.168.1.3] ([80.110.105.32]) by vie01a-pemc-psmtp-pe02 with SMTP @ mailcloud.upcmail.net id WgP41u01T0hxW7C01gP5YA; Tue, 10 Jan 2017 17:23:05 +0100 X-SourceIP: 80.110.105.32 From: Carl Eugen Hoyos To: FFmpeg development discussions and patches Date: Tue, 10 Jan 2017 17:23:04 +0100 User-Agent: KMail/1.9.10 MIME-Version: 1.0 Message-Id: <201701101723.04186.cehoyos@ag.or.at> Subject: [FFmpeg-devel] [PATCH]lavf/matroskaenc: Do not write two CodecID elements for rawvideo 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 #6068. Please comment, Carl Eugen From b100ef83e257d8a106eefa3d2da9463ccd0e87d8 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Tue, 10 Jan 2017 17:21:08 +0100 Subject: [PATCH] lavf/matroskaenc: Do not write two CodecID elements for rawvideo. Fixes ticket #6068. --- libavformat/matroskaenc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 78a621e..7e97586 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1119,6 +1119,7 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, } else { // look for a codec ID string specific to mkv to use, // if none are found, use AVI codes + if (par->codec_id != AV_CODEC_ID_RAWVIDEO || par->codec_tag) for (j = 0; ff_mkv_codec_tags[j].id != AV_CODEC_ID_NONE; j++) { if (ff_mkv_codec_tags[j].id == par->codec_id) { put_ebml_string(pb, MATROSKA_ID_CODECID, ff_mkv_codec_tags[j].str);