From 4587f8d5507300782e329f9527f35f905f3bb697 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期二, 29 十月 2019 14:13:25 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.5.5:29418/valib/goffmpeg
---
goenc.go | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/goenc.go b/goenc.go
index 3d00996..d7a6b43 100644
--- a/goenc.go
+++ b/goenc.go
@@ -5,6 +5,7 @@
#include "libcffmpeg.h"
*/
import "C"
+import "unsafe"
///////////////for encoder
@@ -20,14 +21,14 @@
}
return &GoEncoder{
- enc: C.wrap_fn_create_encoder(C.int(w), C.int(h), C.int(fps), C.int(br), C.int(sFlag), C.int(gi)),
+ enc: C.wrap_fn_create_encoder(unsafe.Pointer(libcffmpeg), C.int(w), C.int(h), C.int(fps), C.int(br), C.int(sFlag), C.int(gi)),
}
}
// Free free
func (e *GoEncoder) Free() {
if e.enc != nil {
- C.wrap_fn_destroy_encoder(e.enc)
+ C.wrap_fn_destroy_encoder(unsafe.Pointer(libcffmpeg), e.enc)
}
}
@@ -39,7 +40,7 @@
cin := C.CBytes(in)
defer C.free(cin)
- p := C.wrap_fn_encode(e.enc, cin, C.int(w), C.int(h), &size, &key)
+ p := C.wrap_fn_encode(unsafe.Pointer(libcffmpeg), e.enc, cin, C.int(w), C.int(h), &size, &key)
defer C.free(p)
if p != nil && size > 0 {
b := C.GoBytes(p, size)
--
Gitblit v1.8.0