From 1fe9a1d773270a0af5476b8b62d96419bbcee9d7 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期二, 03 十二月 2019 16:05:09 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.5.5:29418/valib/goffmpeg
---
csrc/wrapper.cpp | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/csrc/wrapper.cpp b/csrc/wrapper.cpp
index 1798683..cd82a90 100644
--- a/csrc/wrapper.cpp
+++ b/csrc/wrapper.cpp
@@ -154,7 +154,7 @@
stream_ = new stream(in, 3 * in->getFPS());
// stream_->AudioSwitch(audio_);
-
+
decoder_ = new decoder(in);
rec_->Load(in);
@@ -256,7 +256,7 @@
void Wrapper::OpenRecorder(){
run_rec_ = true;
}
-
+
void Wrapper::BuildRecorder(const char* id, const char *output, const int64_t &fid, const int mindur, const int maxdur, const bool audio){
bool a = audio;
if (gb_) a = false;
@@ -323,7 +323,7 @@
cvbridge *bridge;
} PicEncoder;
- void *CreateEncoder(const int w, const int h, const int fps, const int br,
+ void *CreateEncoder(const int w, const int h, const int fps, const int br,
const int pix_fmt, const int scale_flag, const int gi){
PicEncoder *e = (PicEncoder*)malloc(sizeof(PicEncoder));
--
Gitblit v1.8.0