From 5e9814a090f20c2b9c39d6efdc9a732b6097ee7d Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期一, 24 七月 2017 20:12:53 +0800
Subject: [PATCH] aaa
---
RtspFace/PL_Fork1.h | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/RtspFace/PL_Fork.h b/RtspFace/PL_Fork1.h
similarity index 77%
rename from RtspFace/PL_Fork.h
rename to RtspFace/PL_Fork1.h
index 5eaaffe..e719e88 100644
--- a/RtspFace/PL_Fork.h
+++ b/RtspFace/PL_Fork1.h
@@ -1,11 +1,11 @@
-#ifndef _PL_FORK_H_
-#define _PL_FORK_H_
+#ifndef _PL_FORK1_H_
+#define _PL_FORK1_H_
#include "PipeLine.h"
// p1e1 p1e2<fork> p1e3 ... p1eN
// p2e1 p2e2... p2eN
-class PL_Fork : public PipeLineElem
+class PL_Fork1 : public PipeLineElem
{
public:
enum ForkBy
@@ -49,8 +49,8 @@
};
public:
- PL_Fork();
- virtual ~PL_Fork();
+ PL_Fork1();
+ virtual ~PL_Fork1();
virtual bool init(void* args);
virtual void finit();
@@ -65,19 +65,19 @@
PipeLine* pl;
};
-struct PL_Fork_Config
+struct PL_Fork1_Config
{
- PL_Fork::ForkBy forkBy;
- PL_Fork::ForkSync forkSync;
+ PL_Fork1::ForkBy forkBy;
+ PL_Fork1::ForkSync forkSync;
int mainPLType;
int branchPLType;
- PL_Fork_Config() :
- forkBy(PL_Fork::FB_NONE), forkSync(PL_Fork::FS_NONE), mainPLType(0), branchPLType(0)
+ PL_Fork1_Config() :
+ forkBy(PL_Fork1::FB_NONE), forkSync(PL_Fork1::FS_NONE), mainPLType(0), branchPLType(0)
{ }
};
-PipeLineElem* create_PL_Fork();
+PipeLineElem* create_PL_Fork1();
#endif
--
Gitblit v1.8.0