Merge branch 'master' into fix-issues

ai0376 · web-flow · commit 73ab88538f50 · 2020-12-07T14:06:16.000+08:00
diff --git a/source/agent/audio/audioMixer/FfDecoder.cpp b/source/agent/audio/audioMixer/FfDecoder.cpp
@@ -85,7 +85,7 @@ FfDecoder::~FfDecoder()
     }
 
     if (m_decCtx) {
-        avcodec_close(m_decCtx);
+        avcodec_free_context(&m_decCtx);
         m_decCtx = NULL;
     }
 
diff --git a/source/agent/audio/audioMixer/FfEncoder.cpp b/source/agent/audio/audioMixer/FfEncoder.cpp
@@ -65,7 +65,7 @@ FfEncoder::~FfEncoder()
     }
 
     if (m_audioEnc) {
-        avcodec_close(m_audioEnc);
+        avcodec_free_context(&m_audioEnc);
         m_audioEnc = NULL;
     }
 
@@ -179,7 +179,7 @@ bool FfEncoder::initEncoder(const FrameFormat format)
     }
 
     if (m_audioEnc) {
-        avcodec_close(m_audioEnc);
+        avcodec_free_context(&m_audioEnc);
         m_audioEnc = NULL;
     }
 
diff --git a/source/core/owt_base/FFmpegFrameDecoder.cpp b/source/core/owt_base/FFmpegFrameDecoder.cpp
@@ -71,7 +71,7 @@ FFmpegFrameDecoder::~FFmpegFrameDecoder()
     }
 
     if (m_decCtx) {
-        avcodec_close(m_decCtx);
+        avcodec_free_context(&m_decCtx);
         m_decCtx = NULL;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ FfDecoder::~FfDecoder()`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`if (m_decCtx) {`
`88`		`- avcodec_close(m_decCtx);`
	`88`	`+ avcodec_free_context(&m_decCtx);`
`89`	`89`	`m_decCtx = NULL;`
`90`	`90`	`}`
`91`	`91`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ FfEncoder::~FfEncoder()`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`if (m_audioEnc) {`
`68`		`- avcodec_close(m_audioEnc);`
	`68`	`+ avcodec_free_context(&m_audioEnc);`
`69`	`69`	`m_audioEnc = NULL;`
`70`	`70`	`}`
`71`	`71`
`@@ -179,7 +179,7 @@ bool FfEncoder::initEncoder(const FrameFormat format)`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`if (m_audioEnc) {`
`182`		`- avcodec_close(m_audioEnc);`
	`182`	`+ avcodec_free_context(&m_audioEnc);`
`183`	`183`	`m_audioEnc = NULL;`
`184`	`184`	`}`
`185`	`185`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ FFmpegFrameDecoder::~FFmpegFrameDecoder()`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`if (m_decCtx) {`
`74`		`- avcodec_close(m_decCtx);`
	`74`	`+ avcodec_free_context(&m_decCtx);`
`75`	`75`	`m_decCtx = NULL;`
`76`	`76`	`}`
`77`	`77`	`}`