MyFavMirrors
/
owntone-server
mirror of https://github.com/owntone/owntone-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[filescanner_ffmpeg] Refactor: consolidate special handling for 

http-streams
This commit is contained in:
chme 2017-01-28 08:10:16 +01:00 committed by ejurgensen
parent a89440253c
commit e4f25f9418
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/library/filescanner_ffmpeg.c
View File

@ -378,17 +378,14 @@ scan_metadata_ffmpeg(const char *file, struct media_file_info *mfi)
path = strdup(file); path = strdup(file);
#if LIBAVFORMAT_VERSION_MAJOR >= 54 || (LIBAVFORMAT_VERSION_MAJOR == 53 && LIBAVFORMAT_VERSION_MINOR >= 3) #if LIBAVFORMAT_VERSION_MAJOR >= 54 || (LIBAVFORMAT_VERSION_MAJOR == 53 && LIBAVFORMAT_VERSION_MINOR >= 3)
# ifndef HAVE_FFMPEG
// Without this, libav is slow to probe some internet streams
if (mfi->data_kind == DATA_KIND_HTTP) if (mfi->data_kind == DATA_KIND_HTTP)
{ {
# ifndef HAVE_FFMPEG
// Without this, libav is slow to probe some internet streams
ctx = avformat_alloc_context(); ctx = avformat_alloc_context();
ctx->probesize = 64000; ctx->probesize = 64000;
}
# endif # endif
if (mfi->data_kind == DATA_KIND_HTTP)
{
free(path); free(path);
ret = http_stream_setup(&path, file); ret = http_stream_setup(&path, file);
if (ret < 0) if (ret < 0)