MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-04-23 20:15:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixup new libav 10 icy extraction

Browse Source
This commit is contained in:
ejurgensen 2014-06-02 21:51:50 +02:00
parent 6a8f93b7df
commit 844a9b43c9
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/filescanner_ffmpeg.c
View File

@ -336,8 +336,11 @@ extract_metadata_icy(struct media_file_info *mfi, AVFormatContext *ctx)
while (icy_token != NULL) while (icy_token != NULL)
{ {
ptr = strchr(icy_token, ':'); ptr = strchr(icy_token, ':');
if (!ptr || (strlen(ptr) < 3)) if (!ptr || (strlen(ptr) < 4))
icy_token = strtok(NULL, "\r\n"); {
icy_token = strtok(NULL, "\r\n");
continue;
}
ptr++; ptr++;
if (ptr[0] == ' ') if (ptr[0] == ' ')

1
src/filescanner_icy.c
View File

@ -280,7 +280,6 @@ scan_metadata_icy(char *url, struct media_file_info *mfi)
/* Can't count on server support for ICY metadata, so /* Can't count on server support for ICY metadata, so
* while waiting for a reply make a parallel call to scan_metadata_ffmpeg. * while waiting for a reply make a parallel call to scan_metadata_ffmpeg.
* TODO ffmpeg 2/libav 10 has ICY/Shoutcast support
*/ */
no_icy: no_icy:
ret = scan_metadata_ffmpeg(url, mfi); ret = scan_metadata_ffmpeg(url, mfi);