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

Fix merge conflicts

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8272eda529
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2016-08-19 17:58:43 +02:00
parent 5d86ff2594
commit a19fe6bed0
5 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/daemonc/remotecontrol.cpp
View File

@@ -503,8 +503,8 @@ void CRemoteControl::processAPIDnames()
#endif
for(unsigned int count=0; count< current_PIDs.APIDs.size(); count++)
{
const char *iso = getISO639Description(current_PIDs.APIDs[count].desc);
#ifdef APID_DEBUG
const char *iso = getISO639Description(current_PIDs.APIDs[count].desc);
printf("apid=%04x/%s/%s ", current_PIDs.APIDs[count].pid, current_PIDs.APIDs[count].desc, iso);
#endif
if ( current_PIDs.APIDs[count].component_tag != 0xFF )