mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 07:51:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

api ffmpeg, renamed hls format

Browse Source
This commit is contained in:
Jacek Jendrzej
2019-07-17 18:03:59 +02:00
parent 8e5292abc3
commit 173d3a4b89
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/driver/record.cpp
View File

@@ -2178,7 +2178,12 @@ bool CStreamRec::Open(CZapitChannel * channel)
printf("%s: Cannot find stream info [%s]!\n", __FUNCTION__, channel->getUrl().c_str()); printf("%s: Cannot find stream info [%s]!\n", __FUNCTION__, channel->getUrl().c_str());
return false; return false;
} }
if (!strstr(ifcx->iformat->name, "applehttp") && #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58,27,102)
const char *hls = "applehttp";
#else
const char *hls = "hls";
#endif
if (!strstr(ifcx->iformat->name, hls) &&
!strstr(ifcx->iformat->name, "mpegts") && !strstr(ifcx->iformat->name, "mpegts") &&
!strstr(ifcx->iformat->name, "matroska") && !strstr(ifcx->iformat->name, "matroska") &&
!strstr(ifcx->iformat->name, "avi") && !strstr(ifcx->iformat->name, "avi") &&

7
src/driver/streamts.cpp
View File

@@ -842,7 +842,12 @@ bool CStreamStream::Open()
printf("%s: Cannot find stream info [%s]!\n", __FUNCTION__, channel->getUrl().c_str()); printf("%s: Cannot find stream info [%s]!\n", __FUNCTION__, channel->getUrl().c_str());
return false; return false;
} }
if (!strstr(ifcx->iformat->name, "applehttp") && #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58,27,102)
const char *hls = "applehttp";
#else
const char *hls = "hls";
#endif
if (!strstr(ifcx->iformat->name, hls) &&
!strstr(ifcx->iformat->name, "mpegts") && !strstr(ifcx->iformat->name, "mpegts") &&
!strstr(ifcx->iformat->name, "matroska") && !strstr(ifcx->iformat->name, "matroska") &&
!strstr(ifcx->iformat->name, "avi") && !strstr(ifcx->iformat->name, "avi") &&