From 25f4efcdb8b11c2414458c61be3dc1ed73903824 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 30 Oct 2008 19:01:31 +0100 Subject: [PATCH] ffmpeg: eliminated local variable "tag" The function ffmpeg_tag() already has the variable base.tag, which can be used for this. --- src/decoder/ffmpeg_plugin.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/decoder/ffmpeg_plugin.c b/src/decoder/ffmpeg_plugin.c index c04a8b8a5..d13297ad1 100644 --- a/src/decoder/ffmpeg_plugin.c +++ b/src/decoder/ffmpeg_plugin.c @@ -321,27 +321,24 @@ static struct tag *ffmpeg_tag(char *file) struct input_stream input; BasePtrs base; bool ret; - struct tag *tag = NULL; if (!input_stream_open(&input, file)) { ERROR("failed to open %s\n", file); return NULL; } - tag = tag_new(); - base.decoder = NULL; - base.tag = tag; + base.tag = tag_new(); ret = ffmpeg_helper(&input, ffmpeg_tag_internal, &base); if (ret) { - free(tag); - tag = NULL; + free(base.tag); + base.tag = NULL; } input_stream_close(&input); - return tag; + return base.tag; } /**