From patchwork Mon Mar 11 20:22:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Reid X-Patchwork-Id: 12290 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 5B86E4476E6 for ; Mon, 11 Mar 2019 22:22:51 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 32C8A689D10; Mon, 11 Mar 2019 22:22:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9519968090B for ; Mon, 11 Mar 2019 22:22:44 +0200 (EET) Received: by mail-pg1-f180.google.com with SMTP id q206so4908215pgq.4 for ; Mon, 11 Mar 2019 13:22:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=jqfNcsCodm3V4SBwcoUl5P+tPio/g7QY7uOGNb5juSw=; b=Kqe9emM74ZdCHSVlh7u0h40VHRrfXbDNgsdHB7Odi92TyR+TaseQz1ysmeCfKCLlcB HXKAfvh8GOZXe1+m4kcnQH1alSP5OJFdxva2n/GbQYa2d7W0rA1m2GtsOT7wBmOieVea xKrlIxwvUat4lsp5Uo5oUl0m9zzxM25SdZl/FrfJeN3RAiyKLC0QduZZDnMn+Sr5TpCg iJLWRv51ZM2W16eIW77HlcjNHN6OGYiKLwZwkHMQ/4aS6yFgowmSkFbgtzcD7nGZP6Gd lMwjAhCqVMQehp2F0UrV4yVDUz/ARgl94MlkFNr6ywDEqQBEBudVLMZTxae/l49TMbHF /eVQ== 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:mime-version :content-transfer-encoding; bh=jqfNcsCodm3V4SBwcoUl5P+tPio/g7QY7uOGNb5juSw=; b=HnouhvHj3c3XiBhQc3qo0nejT1JU00WTXPU9VMUynv2smy/45uYFHHYUXv4sMaf6Jk o1VEMn1zOjnkG3NMXThyTRac+3nHzvFb5CiwoCD5VL25k9h08kj+IZXzFJfUOt/UCRuf Fnwe8w8BXFzNuatwGpvWkvDnxRmfjjTxczmc1XTFpLOSRwt34NdpI50r6YgUJVXHrZgh cRPzjFEBmxFG0y9T8SqLXG+v30o0Zbq5Zc3TemOfguMZNZZArUQv9NebdiGy5iT5iQYK JabkA8y4wDW08aPqAFHXOwlq4IPpDP1wwLJfWevvHvHwGDhGnwE7F76jizciUb3ejg2V urSw== X-Gm-Message-State: APjAAAUIZYXvERMKga1GWHWy656QMgtbE63uCcPgwrhIM46UD5yFBb1x XrzSQTMFHzpSbR06FpDrmOdNd0Ur X-Google-Smtp-Source: APXvYqwRVHlqoYR8+28rSswQ5e9/57pG+bBfG9HpOILotkyW9v/4VNm7sEcUQY7SgoygtIxHb/EEwA== X-Received: by 2002:a63:1925:: with SMTP id z37mr31367792pgl.67.1552335762577; Mon, 11 Mar 2019 13:22:42 -0700 (PDT) Received: from marks-2018-MacBook-Pro.local.airbud.com ([104.255.9.53]) by smtp.gmail.com with ESMTPSA id g15sm9247245pfo.35.2019.03.11.13.22.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 11 Mar 2019 13:22:42 -0700 (PDT) From: mindmark@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Mar 2019 13:22:37 -0700 Message-Id: <20190311202238.72685-1-mindmark@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/2] avformat/mxfenc: allow user comments for opatom muxer 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: Mark Reid Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Mark Reid --- doc/muxers.texi | 4 ++-- libavformat/mxfenc.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index 372fab2f92..aac7d94edf 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -1629,7 +1629,7 @@ ffmpeg -i file.mpg -c copy \ out.ts @end example -@section mxf, mxf_d10 +@section mxf, mxf_d10, mxf_opatom MXF muxer. @@ -1641,7 +1641,7 @@ The muxer options are: @item store_user_comments @var{bool} Set if user comments should be stored if available or never. IRT D-10 does not allow user comments. The default is thus to write them for -mxf but not for mxf_d10 +mxf and mxf_opatom but not for mxf_d10 @end table @section null diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index 032ee3bf3d..8c6db94865 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -3095,6 +3095,8 @@ static const AVOption opatom_options[] = { { "mxf_audio_edit_rate", "Audio edit rate for timecode", offsetof(MXFContext, audio_edit_rate), AV_OPT_TYPE_RATIONAL, {.dbl=25}, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM }, MXF_COMMON_OPTIONS + { "store_user_comments", "", + offsetof(MXFContext, store_user_comments), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, AV_OPT_FLAG_ENCODING_PARAM}, { NULL }, };