diff options
| author | Max Kellermann <max@duempel.org> | 2009-10-18 19:02:43 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-10-18 19:02:43 +0200 |
| commit | 447e4d3583d3394a25f0fb186f50cea45dd7f797 (patch) | |
| tree | dfbafa9caaef9cc203cd6dde2b090d47d847ae1d /src/decoder | |
| parent | 33bf6c09787033597588e96a6530d5c04b5eb166 (diff) | |
| parent | 7df1a2c77d7f0ac2073d3fe9c7ff85dc4a28e12a (diff) | |
| download | mpd-447e4d3583d3394a25f0fb186f50cea45dd7f797.tar.gz mpd-447e4d3583d3394a25f0fb186f50cea45dd7f797.tar.xz mpd-447e4d3583d3394a25f0fb186f50cea45dd7f797.zip | |
Merged release 0.15.5 from branch 'v0.15.x'
Conflicts:
NEWS
configure.ac
src/decoder/flac_plugin.c
src/update.c
Diffstat (limited to 'src/decoder')
| -rw-r--r-- | src/decoder/flac_plugin.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/decoder/flac_plugin.c b/src/decoder/flac_plugin.c index bf0c76633..9692ba49f 100644 --- a/src/decoder/flac_plugin.c +++ b/src/decoder/flac_plugin.c @@ -299,12 +299,12 @@ flac_cue_tag_load(const char *file) unsigned int sample_rate = 0; FLAC__uint64 track_time = 0; #ifdef HAVE_CUE /* libcue */ - FLAC__StreamMetadata* vc = FLAC__metadata_object_new(FLAC__METADATA_TYPE_VORBIS_COMMENT); + FLAC__StreamMetadata* vc; char* cs_filename; FILE* cs_file; #endif /* libcue */ FLAC__StreamMetadata* si = FLAC__metadata_object_new(FLAC__METADATA_TYPE_STREAMINFO); - FLAC__StreamMetadata* cs = FLAC__metadata_object_new(FLAC__METADATA_TYPE_CUESHEET); + FLAC__StreamMetadata* cs; tnum = flac_vtrack_tnum(file); char_tnum = g_strdup_printf("%u", tnum); @@ -328,6 +328,7 @@ flac_cue_tag_load(const char *file) } } } + FLAC__metadata_object_delete(vc); } |