History

avformat/mxfdec: Offload allocating string to av_dict_set()

Andreas Rheinhardt committed 4 years ago

Commit 9ff0fbb1 parent 6b5e3591 file · +8 −14Browse files

Unified · Split

libavformat/mxfdec.c+8−14
@@ -2118,16 +2118,12 @@ static int mxf_is_intra_only(MXFDescriptor *descriptor) · 2117 unmodified lines
2118 &descriptor->essence_codec_ul)->id != AV_CODEC_ID_NONE;2118 &descriptor->essence_codec_ul)->id != AV_CODEC_ID_NONE;
2119}2119}
2120 2120
2121static int mxf_umid_to_str(UID ul, UID uid, char **str)2121static void mxf_umid_to_str(const UID ul, const UID uid,
2122 char str[2 + sizeof(UID) * 4 + 1])
2122{2123{
2123 char *p;2124 snprintf(str, 2 + sizeof(UID) * 4 + 1, "0x");
2124 p = *str = av_mallocz(sizeof(UID) * 4 + 2 + 1);2125 ff_data_to_hex(str + 2, ul, sizeof(UID), 0);
2125 if (!p)2126 ff_data_to_hex(str + 2 + 2 * sizeof(UID), uid, sizeof(UID), 0);
2126 return AVERROR(ENOMEM);
2127 snprintf(p, 2 + 1, "0x");
2128 ff_data_to_hex(p + 2, ul, sizeof(UID), 0);
2129 ff_data_to_hex(p + 2 + 2 * sizeof(UID), uid, sizeof(UID), 0);
2130 return 0;
2131}2127}
2132 2128
2133static int mxf_version_to_str(uint16_t major, uint16_t minor, uint16_t tertiary,2129static int mxf_version_to_str(uint16_t major, uint16_t minor, uint16_t tertiary,
@@ -2141,13 +2137,11 @@ static int mxf_version_to_str(uint16_t major, uint16_t minor, uint16_t tertiary, · 7 unmodified lines
2141 2137
2142static int mxf_add_umid_metadata(AVDictionary **pm, const char *key, MXFPackage* package)2138static int mxf_add_umid_metadata(AVDictionary **pm, const char *key, MXFPackage* package)
2143{2139{
2144 char *str;2140 char str[2 + 4 * sizeof(UID) + 1];
2145 int ret;
2146 if (!package)2141 if (!package)
2147 return 0;2142 return 0;
2148 if ((ret = mxf_umid_to_str(package->package_ul, package->package_uid, &str)) < 0)2143 mxf_umid_to_str(package->package_ul, package->package_uid, str);
2149 return ret;2144 av_dict_set(pm, key, str, 0);
2150 av_dict_set(pm, key, str, AV_DICT_DONT_STRDUP_VAL);
2151 return 0;2145 return 0;
2152}2146}
2153 2147

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t