From 7c29c41767c57c5308c4ade93c47cebc3729a933 Mon Sep 17 00:00:00 2001
From: xiongziliang <771730766@qq.com>
Date: Tue, 22 May 2018 17:22:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dmp4v2=E5=9C=A8win32=E4=B8=8A?=
 =?UTF-8?q?=E5=B4=A9=E6=BA=83=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MediaFile/HLSMaker.cpp    |  1 +
 src/MediaFile/MediaReader.cpp | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/MediaFile/HLSMaker.cpp b/src/MediaFile/HLSMaker.cpp
index 2833f03f..8a228a48 100644
--- a/src/MediaFile/HLSMaker.cpp
+++ b/src/MediaFile/HLSMaker.cpp
@@ -48,6 +48,7 @@ HLSMaker::HLSMaker(const string& strM3u8File,
 	m_strM3u8File = strM3u8File;
 	m_ui32NumSegments = ui32Num;
 	m_ui32SegmentDuration = ui32Duration;
+	m_ui32LastStamp = 0;
 
 	m_strOutputPrefix = strM3u8File.substr(0, strM3u8File.rfind('.'));
 	m_strFileName = m_strOutputPrefix.substr(m_strOutputPrefix.rfind('/') + 1);
diff --git a/src/MediaFile/MediaReader.cpp b/src/MediaFile/MediaReader.cpp
index 33522ab5..d5d01ccb 100644
--- a/src/MediaFile/MediaReader.cpp
+++ b/src/MediaFile/MediaReader.cpp
@@ -70,17 +70,17 @@ MediaReader::MediaReader(const string &strVhost,const string &strApp, const stri
 					getAVCInfo(m_strSps, (int &)m_video_width, (int &)m_video_height, framerate);
 					m_video_framerate = framerate;
 					m_strSps = string("\x0\x0\x0\x1",4) + m_strSps;
-					free(seqheader[ix]);
+					MP4Free(seqheader[ix]);
 				}
-				free(seqheader);
-				free(seqheadersize);
+				MP4Free(seqheader);
+				MP4Free(seqheadersize);
 				for (ix = 0; pictheadersize[ix] != 0; ix++) {
 					m_strPps.assign("\x0\x0\x0\x1",4);
 					m_strPps.append((char *)(pictheader[ix]), pictheadersize[ix]);
-					free(pictheader[ix]);
+					MP4Free(pictheader[ix]);
 				}
-				free(pictheader);
-				free(pictheadersize);
+				MP4Free(pictheader);
+				MP4Free(pictheadersize);
 			}
 			m_video_ms = 1000.0 * m_video_duration / m_video_timescale;
 			/*InfoL 	<< "\r\n"
@@ -111,7 +111,7 @@ MediaReader::MediaReader(const string &strVhost,const string &strApp, const stri
 				makeAdtsHeader(m_strAacCfg, m_adts);
 				writeAdtsHeader(m_adts,m_adts.data);
 				getAACInfo(m_adts, (int &)m_audio_sample_rate, (int &)m_audio_num_channels);
-				free(ppConfig);
+				MP4Free(ppConfig);
 			}
 			m_audio_ms = 1000.0 * m_audio_duration / m_audio_sample_rate;
 			/*InfoL 	<< "\r\n"