From patchwork Tue Oct 11 21:33:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 962 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp97580vsd; Tue, 11 Oct 2016 14:34:11 -0700 (PDT) X-Received: by 10.28.135.135 with SMTP id j129mr631892wmd.127.1476221651555; Tue, 11 Oct 2016 14:34:11 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d5si715277wme.52.2016.10.11.14.34.06; Tue, 11 Oct 2016 14:34:11 -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; 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 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 1E8D3689B8D; Wed, 12 Oct 2016 00:34:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yb0-f195.google.com (mail-yb0-f195.google.com [209.85.213.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 15AB5689B61 for ; Wed, 12 Oct 2016 00:33:59 +0300 (EEST) Received: by mail-yb0-f195.google.com with SMTP id e2so709970ybi.0 for ; Tue, 11 Oct 2016 14:33:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=brjlaM8fYJoekQG9MCL7Ww/a42dkmO6V678peDkQP2c=; b=DbzO9lQXwu8AMTlrb2xeepJQwM9FenTqOcvYRcJm7OrhgFtmJtUX5cyVXolCmsdxcb QaJr5NpptWz6o726/5Mcv+DD4zCUFl5O3Oek1er7G8jYttvBSiaYiLvDa5MkZWTXEUcC 4JbE7hJXYSP4e+Dl3uMIWwOcAKENely0At6dvVyB1inxUe79nTv6tqEtR2/oXtGnfX9j tUv+TT3QDAWRlvG1ytj4/P6BrJchj0jn08sIydZWTqfvoc+Rghr15KLMS/r5U5jxu1D4 ngIqaJIwr3loW3hZJNuo0x6eu137GvE/Vs3D74BM0IDgS85da0UJp7n4czE9LKVx+uo3 Meqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=brjlaM8fYJoekQG9MCL7Ww/a42dkmO6V678peDkQP2c=; b=H9i3Kr0OqWh580dweBgPq6qVzFy5WvBqI2d0Q0F7IRSwTgLdCFpeISzXLBgMQ4hsQT MK0zn2NUwGVLnncgP99B8rWNiAjp32biMYJQs9VReJgnQvnDmvcYyPgEb/xHfKF4cUtk pUr1fh3rEdo+UcEY52G4mzC4honUmsDdog3fEpFhi1H48lDcYyKxtN1bs6VLNdbI2xJK RGI3duJwLC+nsKInWFVpKibXhjPQjZrKvXRP6iQuMemIrjsvlxjXSbtPDlWt9/QdpXV8 DnpHYnCXQEE1B1qqFiDd0vHocZAz/vZ6+yVNRDbRokAws5GierU9GfPhZ2WB2O+duAJT 9KkQ== X-Gm-Message-State: AA6/9RkMlE0sX21/O2CRF4LQhI+LrgWkfuN6KEV7luVeOM1OQayIFEpXZARdJIGI9KtxAQ== X-Received: by 10.37.97.203 with SMTP id v194mr5294210ybb.149.1476221637289; Tue, 11 Oct 2016 14:33:57 -0700 (PDT) Received: from localhost.localdomain ([181.22.66.211]) by smtp.gmail.com with ESMTPSA id n131sm1809272ywn.11.2016.10.11.14.33.55 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 11 Oct 2016 14:33:56 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 11 Oct 2016 18:33:24 -0300 Message-Id: <20161011213324.7260-1-jamrial@gmail.com> X-Mailer: git-send-email 2.9.1 Subject: [FFmpeg-devel] [PATCH] avformat/matroskaenc: don't write a FlagInterlaced element if it would write the default value 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The spec says: "Mandatory elements with a default value may be left out of the file. In the absence of a mandatory element, the element's default value is used." Signed-off-by: James Almer --- libavformat/matroskaenc.c | 2 -- tests/fate/matroska.mak | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 5293a9b..a48f5bb 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -876,8 +876,6 @@ static void mkv_write_field_order(AVIOContext *pb, int mode, { switch (field_order) { case AV_FIELD_UNKNOWN: - put_ebml_uint(pb, MATROSKA_ID_VIDEOFLAGINTERLACED, - MATROSKA_VIDEO_INTERLACE_FLAG_UNDETERMINED); break; case AV_FIELD_PROGRESSIVE: put_ebml_uint(pb, MATROSKA_ID_VIDEOFLAGINTERLACED, diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak index 7de9a59..63a4252 100644 --- a/tests/fate/matroska.mak +++ b/tests/fate/matroska.mak @@ -4,6 +4,6 @@ FATE_MATROSKA-$(call DEMMUX, MATROSKA, MATROSKA) += fate-matroska-remux fate-matroska-remux: CMD = md5 -i $(TARGET_SAMPLES)/vp9-test-vectors/vp90-2-2pass-akiyo.webm -color_trc 4 -c:v copy -fflags +bitexact -strict -2 -f matroska fate-matroska-remux: CMP = oneline -fate-matroska-remux: REF = d1a5fc15908ba10ca3efa282059ca79f +fate-matroska-remux: REF = 84e950f59677e306f944fca484888c5d FATE_SAMPLES_AVCONV += $(FATE_MATROSKA-yes)