add changed files

This commit is contained in:
smogm
2015-01-11 18:12:55 +01:00
parent 626c785081
commit c37263f594
9 changed files with 21 additions and 18 deletions

View File

@@ -1,8 +1,8 @@
#ifndef _VIDEO_TD_H
#define _VIDEO_TD_H
#include <OpenThreads/Thread>
#include <OpenThreads/Mutex>
#include "../common/thread_abstraction.h"
#include "../common/mutex_abstraction.h"
#include <vector>
#include <linux/dvb/video.h>
#include "../common/cs_types.h"
@@ -120,7 +120,7 @@ typedef enum
#define VDEC_MAXBUFS 0x30
class cVideo : public OpenThreads::Thread
class cVideo : public Thread
{
friend class GLFramebuffer;
friend class cDemux;
@@ -207,7 +207,8 @@ class cVideo : public OpenThreads::Thread
bool thread_running;
VIDEO_FORMAT v_format;
VIDEO_STD v_std;
OpenThreads::Mutex buf_m;
//OpenThreads::Mutex buf_m;
Mutex buf_m;
DISPLAY_AR display_aspect;
DISPLAY_AR_MODE display_crop;
int output_h;