From 1abced42eb3997ef9ef675bfe990f7913ea73f2f Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 23 十二月 2016 18:34:10 +0800
Subject: [PATCH] add h264 encoder and rtsp server
---
RtspFace/PL_RTSPClient.cpp | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/RtspFace/PL_RTSPClient.cpp b/RtspFace/PL_RTSPClient.cpp
index 30c18fd..b26b2c1 100644
--- a/RtspFace/PL_RTSPClient.cpp
+++ b/RtspFace/PL_RTSPClient.cpp
@@ -5,7 +5,7 @@
void rtsp_client_fmtp_callback(void* arg, const char* val);
void rtsp_client_frame_callback(void* arg, uint8_t* buffer, size_t buffSize);
void rtsp_client_continue_callback(void* arg);
-#include "RTSPClient.hpp"
+#include "live555/testProgs/testRTSPClient.hpp"
struct RTSPClient_Internal
{
@@ -36,12 +36,14 @@
{
pthread_mutex_destroy(frame_mutex);
delete frame_mutex;
+ frame_mutex = nullptr;
}
if (continue_mutex != nullptr)
{
pthread_mutex_destroy(continue_mutex);
delete continue_mutex;
+ continue_mutex = nullptr;
}
}
@@ -58,6 +60,7 @@
{
pthread_mutex_destroy(frame_mutex);
delete frame_mutex;
+ frame_mutex = nullptr;
}
frame_mutex = new pthread_mutex_t;
@@ -67,6 +70,7 @@
{
pthread_mutex_destroy(continue_mutex);
delete continue_mutex;
+ continue_mutex = nullptr;
}
continue_mutex = new pthread_mutex_t;
--
Gitblit v1.8.0