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 conflict

Browse Source 
Origin commit data
------------------
Commit: 55f29c5daf
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-07 (Wed, 07 Mar 2012)
This commit is contained in:
[CST] Focus
2012-03-07 17:55:10 +04:00
parent 1d20a0f73a 003ca513e5
commit 90d26b3fec
21 changed files with 49 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/gui/streaminfo2.cpp
View File

@@ -900,18 +900,17 @@ int CStreamInfo2::ts_setup ()
int CStreamInfo2::update_rate ()
{
unsigned char buf[TS_BUF_SIZE];
long b;
int ret = 0;
int b_len, b_start;
int timeout = 100;
if(!dmx)
return 0;
b_len = 0;
b_start = 0;
unsigned char buf[TS_BUF_SIZE] = {0};
long b = 0;
int ret = 0;
int b_len = 0;
int timeout = 100;
b_len = dmx->Read(buf, sizeof (buf), timeout);
//printf("ts: read %d\n", b_len);