Signed-off-by: Andreas Rheinhardt <[email protected]>
---
libavformat/mxfdec.c | 21 +++++++--------------
1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index 77bde7c3fe..ad8fb77f9b 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -2118,16 +2118,11 @@ static int mxf_is_intra_only(MXFDescriptor *descriptor)
&descriptor->essence_codec_ul)->id !=
AV_CODEC_ID_NONE;
}
-static int mxf_umid_to_str(UID ul, UID uid, char **str)
+static void mxf_umid_to_str(UID ul, UID uid, char str[2 + sizeof(UID) * 4 + 1])
{
- char *p;
- p = *str = av_mallocz(sizeof(UID) * 4 + 2 + 1);
- if (!p)
- return AVERROR(ENOMEM);
- snprintf(p, 2 + 1, "0x");
- ff_data_to_hex(p + 2, ul, sizeof(UID), 0);
- ff_data_to_hex(p + 2 + 2 * sizeof(UID), uid, sizeof(UID), 0);
- return 0;
+ snprintf(str, 2 + sizeof(UID) * 4 + 1, "0x");
+ ff_data_to_hex(str + 2, ul, sizeof(UID), 0);
+ ff_data_to_hex(str + 2 + 2 * sizeof(UID), uid, sizeof(UID), 0);
}
static int mxf_version_to_str(uint16_t major, uint16_t minor, uint16_t
tertiary,
@@ -2141,13 +2136,11 @@ static int mxf_version_to_str(uint16_t major, uint16_t
minor, uint16_t tertiary,
static int mxf_add_umid_metadata(AVDictionary **pm, const char *key,
MXFPackage* package)
{
- char *str;
- int ret;
+ char str[2 + 4 * sizeof(UID) + 1];
if (!package)
return 0;
- if ((ret = mxf_umid_to_str(package->package_ul, package->package_uid,
&str)) < 0)
- return ret;
- av_dict_set(pm, key, str, AV_DICT_DONT_STRDUP_VAL);
+ mxf_umid_to_str(package->package_ul, package->package_uid, str);
+ av_dict_set(pm, key, str, 0);
return 0;
}
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
[email protected]
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
[email protected] with subject "unsubscribe".
