From 78a05014a9ad534c6fc2aad8a6a22be6ba5032e8 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 07 五月 2019 14:50:35 +0800
Subject: [PATCH] init ffmpeg
---
decoder/main.go | 5 +++++
decoder/valib/goffmpeg | 2 +-
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/decoder/main.go b/decoder/main.go
index 121c5c2..3f5f252 100644
--- a/decoder/main.go
+++ b/decoder/main.go
@@ -2,6 +2,7 @@
import (
"context"
+ "decoder/valib/goffmpeg"
"decoder/valib/ipc"
srv "decoder/work/service"
"encoding/json"
@@ -81,6 +82,8 @@
func main() {
flag.Parse()
+ goffmpeg.InitFFmpeg()
+
if testIt {
test()
}
@@ -120,6 +123,8 @@
}
}
}
+
+ goffmpeg.FreeFFmpeg()
cancel()
}
diff --git a/decoder/valib/goffmpeg b/decoder/valib/goffmpeg
index f4f467c..a96e38b 160000
--- a/decoder/valib/goffmpeg
+++ b/decoder/valib/goffmpeg
@@ -1 +1 @@
-Subproject commit f4f467c5a908ddca5d28b61497b8e40c8668fff8
+Subproject commit a96e38b66179a67380132704f76d6abd8f648afe
--
Gitblit v1.8.0