mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 09:21:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/mp

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7ad4a0e6cc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-02 (Mon, 02 Oct 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2017-10-02 13:56:25 +02:00
parent f5fc50139e 586a1b5a49
commit a91765a685
38 changed files with 68 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/driver/audiodec/basedec.cpp
View File

@@ -72,7 +72,7 @@ CBaseDec::RetCode CBaseDec::DecoderBase(CAudiofile* const in,
RetCode Status = OK;
FILE* fp;
if(( in->FileType == CFile::STREAM_AUDIO ) && (in->Filename.find(".flv") != string::npos))
if ((in->FileType == CFile::STREAM_AUDIO) && (in->Filename.find(".flv") != std::string::npos))
{
fp = fopen( in->Filename.c_str(), "rc" );
}

2
src/driver/movieinfo.cpp
View File

@@ -55,7 +55,7 @@ CMovieInfo::~CMovieInfo()
bool CMovieInfo::convertTs2XmlName(std::string& filename)
{
size_t lastdot = filename.find_last_of(".");
if (lastdot != string::npos) {
if (lastdot != std::string::npos) {
filename.erase(lastdot + 1);
filename.append("xml");
return true;