output streams were disposed twice when closing a Muxer twice, but this should only ever happen once

Raveler · Raveler · commit 76f57966d450 · 2019-01-14T11:13:23.000+01:00
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/Muxing/Muxer.cpp b/source/ffmpeg-cpp/ffmpeg-cpp/Muxing/Muxer.cpp
@@ -52,6 +52,10 @@ namespace ffmpegcpp
 
 			avformat_free_context(containerContext);
 			containerContext = nullptr;
+
+			// when the container is closed, the related output streams are closed as well,
+			// so we clean those up.
+			outputStreams.clear();
 		}
 
 		// clean up the queue
@@ -60,6 +64,7 @@ namespace ffmpegcpp
 			AVPacket* tmp_pkt = packetQueue[i];
 			av_packet_free(&tmp_pkt);
 		}
+		packetQueue.clear();
 	}
 
 	void Muxer::AddOutputStream(OutputStream* outputStream)

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,10 @@ namespace ffmpegcpp`
`52`	`52`
`53`	`53`	`avformat_free_context(containerContext);`
`54`	`54`	`containerContext = nullptr;`
	`55`	`+`
	`56`	`+ // when the container is closed, the related output streams are closed as well,`
	`57`	`+ // so we clean those up.`
	`58`	`+ outputStreams.clear();`
`55`	`59`	`}`
`56`	`60`
`57`	`61`	`// clean up the queue`
`@@ -60,6 +64,7 @@ namespace ffmpegcpp`
`60`	`64`	`AVPacket* tmp_pkt = packetQueue[i];`
`61`	`65`	`av_packet_free(&tmp_pkt);`
`62`	`66`	`}`
	`67`	`+ packetQueue.clear();`
`63`	`68`	`}`
`64`	`69`
`65`	`70`	`void Muxer::AddOutputStream(OutputStream* outputStream)`