From patchwork Wed Feb 17 10:13:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25696 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id AA1A944868C for ; Wed, 17 Feb 2021 12:20:52 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8510A68A545; Wed, 17 Feb 2021 12:20:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 15AE268A33F for ; Wed, 17 Feb 2021 12:20:46 +0200 (EET) Received: by mail-wm1-f45.google.com with SMTP id m1so3058877wml.2 for ; Wed, 17 Feb 2021 02:20:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=SEFMyIW/d0w6rnorJ6PhMDOgMOBkrMB/oXfUX4E9ZF8=; b=bxk6EnpIcP19HvgKvlVWhw49QTDH0LCzXq70u+pRwgKRN3j6pGMv8gTzLH0eXgFHUw Tc9h95DHDoMnFw8M5cN8p/UKDgcrqeX4wYAT+6Dtk0glEUg/3ySjOIzhxi6qRNnHkh3g zENt3jQuPvQ1d3rmhyjtg4fV9gs39yzu9zsUUOS4YopjvZFrHUt1S8epCTGkazAPP4xQ F75CYSh/LxwkJi1bQR9ym+scrnCmy1pkdaf7LfWNMXdsvebtswDfuB+oHjo9C4QOHEFG 5lTCj7cLkThd+V4i0akTqKDG+V5Wr011rP3qA+fYMt7SU1iOksbnjJ71AznZS3feFU5C BtVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=SEFMyIW/d0w6rnorJ6PhMDOgMOBkrMB/oXfUX4E9ZF8=; b=DB9bXFXwksULwc4YPYTwucPuQ1AyTjJAMFmgT/owKMQEK20ENzVL4kfGFktrB1gjGJ FIkWhDDgjFE36UhybWHGJM/0ebCVcfgCll2pNPLUbRJ83uAtmCzTCWhlOl0Muwv20RDU db5EE+s4MtHBN798VBujlG/cpZdiwJgEG9h4DOAON8CBcJ+yTZH3EFIFBBhUBMvE15Io 1IitEknoatA0c67ybwdCfZ3by7Ve6ZG3yIxIUVBtndKl8BFy9c8cSAmH44RErzN1mtJJ N+TKME9VJKbr+YNKfRWQ7CIIWTyV7H97GbY8S5dOQc+d67LPiIRpqbjaqBr+DpBuKQTO IEQA== X-Gm-Message-State: AOAM532Zfwi7d02EF2RTxcsu6ZS1iwBYnEW3VselExysxuTMIpqH11SC Mm1aHwi7ODDRnDUu46FCQnuDLzOeGSE= X-Google-Smtp-Source: ABdhPJxexUKIziCLxKpDbcyUi2PvIgRJ4dpTiD6h4egIlyM3/iw4jhcInQyS3CzJ0emSWYkTPqkIcg== X-Received: by 2002:a1c:5a54:: with SMTP id o81mr6480205wmb.50.1613556864896; Wed, 17 Feb 2021 02:14:24 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id v12sm3502828wrv.69.2021.02.17.02.14.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Feb 2021 02:14:24 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 17 Feb 2021 11:13:41 +0100 Message-Id: <20210217101356.1723370-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210217101356.1723370-1-andreas.rheinhardt@gmail.com> References: <20210217101356.1723370-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 04/19] avformat/matroskaenc: Don't write empty language 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" According to the new EBML specifications, a string element of length zero would be read as the default value by a compliant parser. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 233c472b8f..786fa41cba 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1147,7 +1147,7 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, put_ebml_string(pb, MATROSKA_ID_TRACKNAME, tag->value); tag = av_dict_get(st->metadata, "language", NULL, 0); put_ebml_string(pb, MATROSKA_ID_TRACKLANGUAGE, - tag && tag->value ? tag->value : "und"); + tag && tag->value && tag->value[0] ? tag->value : "und"); // The default value for TRACKFLAGDEFAULT is 1, so add element // if we need to clear it.