mirror of https://git.ffmpeg.org/ffmpeg.git
avformat/id3v2: Avoid av_strdup for key and value of dict
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
parent
8d5f9daacd
commit
a7245adee3
|
@ -361,8 +361,8 @@ static void read_uslt(AVFormatContext *s, AVIOContext *pb, int taglen,
|
||||||
{
|
{
|
||||||
uint8_t lang[4];
|
uint8_t lang[4];
|
||||||
uint8_t *descriptor = NULL; // 'Content descriptor'
|
uint8_t *descriptor = NULL; // 'Content descriptor'
|
||||||
uint8_t *text = NULL;
|
uint8_t *text;
|
||||||
char *key = NULL;
|
char *key;
|
||||||
int encoding;
|
int encoding;
|
||||||
int ok = 0;
|
int ok = 0;
|
||||||
|
|
||||||
|
@ -387,18 +387,19 @@ static void read_uslt(AVFormatContext *s, AVIOContext *pb, int taglen,
|
||||||
key = av_asprintf("lyrics-%s%s%s", descriptor[0] ? (char *)descriptor : "",
|
key = av_asprintf("lyrics-%s%s%s", descriptor[0] ? (char *)descriptor : "",
|
||||||
descriptor[0] ? "-" : "",
|
descriptor[0] ? "-" : "",
|
||||||
lang);
|
lang);
|
||||||
if (!key)
|
if (!key) {
|
||||||
|
av_free(text);
|
||||||
goto error;
|
goto error;
|
||||||
|
}
|
||||||
|
|
||||||
av_dict_set(metadata, key, text, 0);
|
av_dict_set(metadata, key, text,
|
||||||
|
AV_DICT_DONT_STRDUP_KEY | AV_DICT_DONT_STRDUP_VAL);
|
||||||
|
|
||||||
ok = 1;
|
ok = 1;
|
||||||
error:
|
error:
|
||||||
if (!ok)
|
if (!ok)
|
||||||
av_log(s, AV_LOG_ERROR, "Error reading lyrics, skipped\n");
|
av_log(s, AV_LOG_ERROR, "Error reading lyrics, skipped\n");
|
||||||
av_free(descriptor);
|
av_free(descriptor);
|
||||||
av_free(text);
|
|
||||||
av_free(key);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue