diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-02-15 16:54:59 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-02-16 22:49:02 +0100 |
| commit | 58020bbed173f224a618b64e9ef332b28dc16905 (patch) | |
| tree | f9bf669cce5a8bc9f4f1da469367342bf482b5c4 | |
| parent | 5400e4a50c61e53e1bc50b3e77201649bbe9c510 (diff) | |
| download | ffmpeg-58020bbed173f224a618b64e9ef332b28dc16905.tar.gz | |
avformat/mxfenc: Use user-specified version even when bitexact
Doing so is still bitexact.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
| -rw-r--r-- | libavformat/mxfenc.c | 7 |
1 files 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) + |