Merge remote-tracking branch 'seife/master'

Origin commit data
------------------
Branch: master
Commit: 2ca16aedac
Author: martii <you@example.com>
Date: 2012-07-15 (Sun, 15 Jul 2012)


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

------------------
This commit was generated by Migit
This commit is contained in:
martii
2012-07-15 20:13:18 +02:00
6 changed files with 67 additions and 6 deletions

View File

@@ -98,6 +98,9 @@ bool cDemux::Open(DMX_CHANNEL_TYPE pes_type, void * /*hVideoBuffer*/, int uBuffe
int flags = O_RDWR;
if (fd > -1)
lt_info("%s FD ALREADY OPENED? fd = %d\n", __FUNCTION__, fd);
if (pes_type != DMX_PSI_CHANNEL)
flags |= O_NONBLOCK;
#if 0
if (pes_type == DMX_TP_CHANNEL)
{