From patchwork Mon Mar 11 02:03:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Reid X-Patchwork-Id: 12283 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 918A74487CC for ; Mon, 11 Mar 2019 04:03:19 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 76B0568982A; Mon, 11 Mar 2019 04:03:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0FE42680A95 for ; Mon, 11 Mar 2019 04:03:13 +0200 (EET) Received: by mail-pf1-f178.google.com with SMTP id i20so2524591pfo.6 for ; Sun, 10 Mar 2019 19:03:12 -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=O80wl+onOQGe1IaMgGeHM7C8cDWpa5JxUrNhCn7B9NI=; b=Om3kNAEH8YbgzlBvwcne+Ym/L2svpkvw872ZKqUULGd+v8Tc3/TKH3Yaxtpft+jTVy 6aAEhdImpBfVebj4iXGW32bNQQk5CslrwavfE8zBYBOevja2ejHq0Z8YpXlNT1LQrAd4 3yQCw3PBCklVGo1fb9lg4I7iuVgU7B6rgtKshtVDf6f7FaAjG37IlldrdBQNHm9clRin 8r598QnmKru47Tqy4SVtXdzaPqQOwLmukJqEFUfvf5s97D3uwqR8xbWGahmALvVMBSFj /4+fI5sZPHwtiBnHaoXSyDQqcihBY7oj/BGM9aTwSwwk+4wBUvb+TGkONudreSnui04a zHGQ== 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=O80wl+onOQGe1IaMgGeHM7C8cDWpa5JxUrNhCn7B9NI=; b=X8FonvmK1tI4qBBsix1SOehaT0/bShEPBDfZzfzISW9lyTJEvB83kYHZPdMzpK9NB6 euzLyj6ySh+/QLWZxdyW7DfAcF2rCxzplvU3TSxHA97iHwpJgoNASqISQ9YxaVnermNE 7zVaJRs7DrA05JqLvkyvDHAJGGh0sJejiphT+OiCTxphbR/csRlPdEBjRjiasyb1fnJi LLRM2SSIFBRhhVqgZbz0BY4hAwfcTxaqFxjHsR2C0vGHnye67TqzDuhscq94j17HxqU6 wKAnZX8G3MBlnlL/nX/TIA1AB5Cxo/jHJI/QdighIie6M2P64ZJ0y5ZFl+NgSfHOcnT+ LtCw== X-Gm-Message-State: APjAAAWNoDRhAddudQKE7Od4mT5Z/HuPt7zFMt7CoP3L+6YANh4mY6aV RTv0e3cuhmmGzsCeKxexAowy+nLv X-Google-Smtp-Source: APXvYqw5A9eMJD6cx+eC9q9lE0nX4kHrDSF05Yt6EdYvVUduWqmadVtT5mtkYcnLER5QSh21BlhTQg== X-Received: by 2002:a17:902:523:: with SMTP id 32mr3906573plf.249.1552269790783; Sun, 10 Mar 2019 19:03:10 -0700 (PDT) Received: from localhost.localdomain (S0106ac2e8c9e4f8e.vc.shawcable.net. [24.86.166.45]) by smtp.gmail.com with ESMTPSA id s1sm5319969pgv.30.2019.03.10.19.03.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 10 Mar 2019 19:03:10 -0700 (PDT) From: mindmark@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Mar 2019 19:03:07 -0700 Message-Id: <20190311020307.6680-1-mindmark@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] 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 This patch restores the ability to add user comments for the opatom_mxf muxer. The ability seems to have been disabled in d9726893f31. --- doc/muxers.texi | 2 +- libavformat/mxfenc.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) -- 2.18.0 diff --git a/doc/muxers.texi b/doc/muxers.texi index 372fab2f92..764102bf4b 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. 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 }, };