diff mbox series

[FFmpeg-devel,v2,2/6] avformat/mxfenc: Use user-specified version even when bitexact

Message ID 20210215165549.667105-2-andreas.rheinhardt@gmail.com
State Accepted
Commit 58020bbed173f224a618b64e9ef332b28dc16905
Headers show
Series [FFmpeg-devel,v2,1/6] avformat/mxfenc: Never set codec_ul UID to NULL | expand

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make success Make finished
andriy/PPC64_make_fate success Make fate finished

Commit Message

Andreas Rheinhardt Feb. 15, 2021, 4:55 p.m. UTC 
Doing so is still bitexact.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
---
 libavformat/mxfenc.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

Comments

Tomas Härdin Feb. 18, 2021, 8:10 a.m. UTC | #1 
mån 2021-02-15 klockan 17:55 +0100 skrev Andreas Rheinhardt:
> Doing so is still bitexact.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
> ---
>  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);

Looks OK

/Tomas
diff mbox series

Patch

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) +