From patchwork Mon Feb 15 16:55:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25641 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 B39B144B8A3 for ; Mon, 15 Feb 2021 18:56:19 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 98AE3688128; Mon, 15 Feb 2021 18:56:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 09736688092 for ; Mon, 15 Feb 2021 18:56:17 +0200 (EET) Received: by mail-wr1-f45.google.com with SMTP id t15so9678065wrx.13 for ; Mon, 15 Feb 2021 08:56:17 -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=KRivQKUPyrDYlgxfNQt4OI5j7UXHly6F0ehD8GyjXtI=; b=kxaED39FsUGSZ++g2QmcGhJ7NYQMzpWK6g5rqzYjRGTgCfANDLDbKVzMELJyM/Ts7j WtXMLdFf2OLdBbK4zlbbJ7zJychAxVHB/HKNYfeoSzCXFkKgp0i79QO7gIAa1juc82KY ZnA27iNy1oKXipWyGtzVKTQJltJ3/TjnZAoyIvb8A51bMx7acOjwdZ7fKm1TPBmtuB0O MOk/NAYwwOq5k/ldZnYU0J5kbEkdYFo/sLswgFCuNiCYcTxodx0o5SWz0rmfLXdrzW8X vqQYZgvbF6JnpWfY5nJmG8Iqutfd7LSS8SxtspQIanvTEh4GZifi9UXoOuuwVvlxQpol Jqaw== 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=KRivQKUPyrDYlgxfNQt4OI5j7UXHly6F0ehD8GyjXtI=; b=leJ+6NN1VLKIJewIrtHuFNm+fdTHS46vaf6N6/i7Z9aXRNqtoZU5qbITNpi8mCJJWd a0MfhJGMrpiR0gqtx2K7+zUBqn39wQxkXMz93MFLuaocOuWjc4ZVq5iDbjjqjS17tMzU 3adZ7WaApslfPpwAo2LPNKrLoZoBDN71r/hx7Pn9W6NePJRuFSejt/YJDdE8GwuEZVUN qgtQLCkIiTm09afBe6sPsa46d471ERX63W5rCCipwApN5srv3E9htRuaL1ywMMvPHlfE z995UUczbDyNsWHmKZ1CXjeKM4CczTw+qw6/VblEkykz3PHq43Mx3PUTouYbCHdkSBLX UelA== X-Gm-Message-State: AOAM531gmVpgzqPEe1Eg5v2yqOHLRIoEjp+J5QTKGdKq2Tpcg1kzyAXW 3COjLykkSS8epd4DV5X7UbJKVwzzvnQ= X-Google-Smtp-Source: ABdhPJxyFHix1M8KXVuBX3fQvfE5W9wDqjhjeJR8hM1r82LEU/zWQj4ejy29kNKWgMW1Xg3vJqCzgQ== X-Received: by 2002:adf:9504:: with SMTP id 4mr19409832wrs.306.1613408177185; Mon, 15 Feb 2021 08:56:17 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id b2sm24531855wrv.73.2021.02.15.08.56.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Feb 2021 08:56:16 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 Feb 2021 17:55:45 +0100 Message-Id: <20210215165549.667105-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210215165549.667105-1-andreas.rheinhardt@gmail.com> References: <20210215165549.667105-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/6] avformat/mxfenc: Use user-specified version even when bitexact 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" Doing so is still bitexact. Signed-off-by: Andreas Rheinhardt --- libavformat/mxfenc.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index 509cae8442..3bfe2a5c1a 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -762,16 +762,15 @@ static void mxf_write_identification(AVFormatContext *s) AVDictionaryEntry *version_entry = av_dict_get(s->metadata, "product_version", NULL, 0); const char *company = com_entry ? com_entry->value : "FFmpeg"; const char *product = product_entry ? product_entry->value : s->oformat != &ff_mxf_opatom_muxer ? "OP1a Muxer" : "OPAtom Muxer"; - const char *product_version = version_entry ? version_entry->value : AV_STRINGIFY(LIBAVFORMAT_VERSION); const char *platform = s->flags & AVFMT_FLAG_BITEXACT ? "Lavf" : PLATFROM_IDENT; - const char *version; + const char *version = version_entry ? version_entry->value : + s->flags & AVFMT_FLAG_BITEXACT ? "0.0.0" : + AV_STRINGIFY(LIBAVFORMAT_VERSION); int length; mxf_write_metadata_key(pb, 0x013000); PRINT_KEY(s, "identification key", pb->buf_ptr - 16); - version = s->flags & AVFMT_FLAG_BITEXACT ? - "0.0.0" : product_version; length = 100 +mxf_utf16_local_tag_length(company) + mxf_utf16_local_tag_length(product) + mxf_utf16_local_tag_length(platform) +