Merge tag 'release-0.17.5'

This commit is contained in:
Max Kellermann
2013-08-04 14:36:22 +02:00
8 changed files with 44 additions and 19 deletions

View File

@@ -586,6 +586,7 @@ static const char *const ffmpeg_suffixes[] = {
};
static const char *const ffmpeg_mime_types[] = {
"application/flv",
"application/m4a",
"application/mp4",
"application/octet-stream",

View File

@@ -199,7 +199,11 @@ mikmod_decoder_scan_file(const char *path_fs,
if (title != nullptr) {
tag_handler_invoke_tag(handler, handler_ctx,
TAG_TITLE, title);
#if (LIBMIKMOD_VERSION >= 0x030200)
MikMod_free(title);
#else
free(title);
#endif
}
return true;