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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	configure.ac
	lib/Makefile.am
	src/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3ed2ebe75b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-10-25 12:30:10 +02:00
parent e6e7bed4b6 01acc7d9ae
commit 59c83b2c70
21 changed files with 264 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/driver/record.h
View File

@@ -42,9 +42,11 @@
#include <OpenThreads/Mutex>
#include <OpenThreads/Thread>
#if 0
extern "C" {
#include <libavformat/avformat.h>
}
#endif
#define REC_MAX_APIDS 10
#define FILENAMEBUFFERSIZE 1024
@@ -249,6 +251,7 @@ class CRecordManager : public CMenuTarget /*, public CChangeObserver*/
#endif
};
#if 0
class CStreamRec : public CRecordInstance, OpenThreads::Thread
{
private:
@@ -275,5 +278,6 @@ class CStreamRec : public CRecordInstance, OpenThreads::Thread
bool Stop(bool remove_event = true);
static int Interrupt(void * data);
};
#endif
#endif