From ea3953ad406e96e95c533ef850c6395da6a7dd86 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Tue, 2 Mar 2021 15:44:07 +0100 Subject: avformat/dashdec: Don't needlessly strdup metadata Reviewed-by: James Almer Signed-off-by: Andreas Rheinhardt --- libavformat/dashdec.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) (limited to 'libavformat') diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index 947b42f816..6f3f28dcc7 100644 --- a/libavformat/dashdec.c +++ b/libavformat/dashdec.c @@ -2039,6 +2039,14 @@ static int copy_init_section(struct representation *rep_dest, struct representat static int dash_close(AVFormatContext *s); +static void move_metadata(AVStream *st, const char *key, char **value) +{ + if (*value) { + av_dict_set(&st->metadata, key, *value, AV_DICT_DONT_STRDUP_VAL); + *value = NULL; + } +} + static int dash_read_header(AVFormatContext *s) { DASHContext *c = s->priv_data; @@ -2137,8 +2145,7 @@ static int dash_read_header(AVFormatContext *s) rep->assoc_stream = s->streams[rep->stream_index]; if (rep->bandwidth > 0) av_dict_set_int(&rep->assoc_stream->metadata, "variant_bitrate", rep->bandwidth, 0); - if (rep->id) - av_dict_set(&rep->assoc_stream->metadata, "id", rep->id, 0); + move_metadata(rep->assoc_stream, "id", &rep->id); } for (i = 0; i < c->n_audios; i++) { rep = c->audios[i]; @@ -2146,23 +2153,15 @@ static int dash_read_header(AVFormatContext *s) rep->assoc_stream = s->streams[rep->stream_index]; if (rep->bandwidth > 0) av_dict_set_int(&rep->assoc_stream->metadata, "variant_bitrate", rep->bandwidth, 0); - if (rep->id) - av_dict_set(&rep->assoc_stream->metadata, "id", rep->id, 0); - if (rep->lang) { - av_dict_set(&rep->assoc_stream->metadata, "language", rep->lang, 0); - av_freep(&rep->lang); - } + move_metadata(rep->assoc_stream, "id", &rep->id); + move_metadata(rep->assoc_stream, "language", &rep->lang); } for (i = 0; i < c->n_subtitles; i++) { rep = c->subtitles[i]; av_program_add_stream_index(s, 0, rep->stream_index); rep->assoc_stream = s->streams[rep->stream_index]; - if (rep->id) - av_dict_set(&rep->assoc_stream->metadata, "id", rep->id, 0); - if (rep->lang) { - av_dict_set(&rep->assoc_stream->metadata, "language", rep->lang, 0); - av_freep(&rep->lang); - } + move_metadata(rep->assoc_stream, "id", &rep->id); + move_metadata(rep->assoc_stream, "language", &rep->lang); } return 0; -- cgit v1.2.3