From 92b57a3e430c1d026cd61505ca6522a12b0e048b Mon Sep 17 00:00:00 2001 From: Tryanks Date: Mon, 27 May 2024 11:45:06 +0800 Subject: [PATCH] Fixed MPP_RET_NULL_PTR --- frame.go | 6 +++--- packet.go | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/frame.go b/frame.go index c40a162..e9e29c7 100644 --- a/frame.go +++ b/frame.go @@ -375,9 +375,9 @@ const ( ) func MppFrameInit() (*MppFrame, MppRet) { - frame := new(MppFrame) - ret := MppRet(C.mpp_frame_init(frame.c)) - return frame, ret + cFrame := C.MppFrame(nil) + ret := MppRet(C.mpp_frame_init(&cFrame)) + return &MppFrame{c: cFrame}, ret } func (f *MppFrame) Deinit() MppRet { diff --git a/packet.go b/packet.go index 0056c08..a9db3f5 100644 --- a/packet.go +++ b/packet.go @@ -14,12 +14,11 @@ void MppPktSeg_setType(MppPktSeg seg, RK_S32 type) { import "C" func NewMppPacket() (*MppPacket, MppRet) { - packet := new(MppPacket) - ret := MppRet(C.mpp_packet_new(packet.c)) - return packet, ret + cPacket := C.MppPacket(nil) + ret := MppRet(C.mpp_packet_new(cPacket)) + return &MppPacket{c: cPacket}, ret } -// MPP_RET mpp_packet_init(MppPacket *packet, void *data, size_t size); func (packet *MppPacket) Init(data []byte, size int64) MppRet { return MppRet(C.mpp_packet_init(packet.c, C.CBytes(data), C.size_t(size))) }