summaryrefslogtreecommitdiff
path: root/libavformat/mxfenc.c
diff options
context:
space:
mode:
authorLimin Wang <lance.lmwang@gmail.com>2021-02-02 20:41:22 +0800
committerLimin Wang <lance.lmwang@gmail.com>2021-02-05 09:27:06 +0800
commit81c462ad95f143837a6a21126117515577f0977b (patch)
tree6b464011cdd9db5feb2fde78f7911996374d8c03 /libavformat/mxfenc.c
parent9605307e7854ac4941ae4e7400b997612fa6712c (diff)
avformat/mxfenc: prefer to use the configured metadata
The metadata company_name, product_name, product_version from input file will be deleted to avoid overwriting information Please to test with below commands: ./ffmpeg -i ../fate-suite/mxf/Sony-00001.mxf -c:v copy -c:a copy out.mxf and ./ffmpeg -i ../fate-suite/mxf/Sony-00001.mxf -c:v copy -c:a copy \ -metadata company_name="xxx" \ -metadata product_name="xxx" \ -metadata product_version="xxx" \ out.mxf Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
Diffstat (limited to 'libavformat/mxfenc.c')
-rw-r--r--libavformat/mxfenc.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
index 39ab443a04..0b399178b5 100644
--- a/libavformat/mxfenc.c
+++ b/libavformat/mxfenc.c
@@ -757,8 +757,12 @@ static void mxf_write_identification(AVFormatContext *s)
{
MXFContext *mxf = s->priv_data;
AVIOContext *pb = s->pb;
- const char *company = "FFmpeg";
- const char *product = s->oformat != &ff_mxf_opatom_muxer ? "OP1a Muxer" : "OPAtom Muxer";
+ AVDictionaryEntry *com_entry = av_dict_get(s->metadata, "company_name", NULL, 0);
+ AVDictionaryEntry *product_entry = av_dict_get(s->metadata, "product_name", NULL, 0);
+ 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;
int length;
@@ -767,7 +771,7 @@ static void mxf_write_identification(AVFormatContext *s)
PRINT_KEY(s, "identification key", pb->buf_ptr - 16);
version = s->flags & AVFMT_FLAG_BITEXACT ?
- "0.0.0" : AV_STRINGIFY(LIBAVFORMAT_VERSION);
+ "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) +