Remove filescanner_icy.c and consolidate in http.c.

Libav 9 does not support ICY metadata, so in that case we must be able to get it outselves.
This commit is contained in:
ejurgensen
2015-03-29 00:29:06 +01:00
parent b8d8df132b
commit ea29a8d988
6 changed files with 229 additions and 404 deletions

View File

@@ -693,11 +693,7 @@ filescanner_process_media(char *path, time_t mtime, off_t size, int type, struct
else if (type & F_SCAN_TYPE_URL)
{
mfi->data_kind = 1; /* url/stream */
#if LIBAVFORMAT_VERSION_MAJOR >= 56 || (LIBAVFORMAT_VERSION_MAJOR == 55 && LIBAVFORMAT_VERSION_MINOR >= 13)
ret = scan_metadata_ffmpeg(path, mfi);
#else
ret = scan_metadata_icy(path, mfi);
#endif
}
else if (type & F_SCAN_TYPE_SPOTIFY)
{