Merge branch 'refs/heads/dev' into plugin

# Conflicts:
#	.gitmodules
#	CMakeLists.txt
#	ext/core

app/codec/ffmpeg/ffmpegencoder.cpp

@@ -22,6 +22,7 @@ extern "C" {
 #include <libavfilter/buffersink.h>
 #include <libavfilter/buffersrc.h>
 #include <libavutil/pixdesc.h>
+#include <libavformat/avformat.h>
 }
 
 #include <QFile>
@@ -866,7 +867,7 @@ void FFmpegEncoder::FlushEncoders()
 	}
 
 	if (fmt_ctx_) {
-		if (fmt_ctx_->oformat->flags & AVFMT_ALLOW_FLUSH) {
+		if (fmt_ctx_->oformat->flags) {
 			int r = av_interleaved_write_frame(fmt_ctx_, nullptr);
 			if (r < 0) {
 				FFmpegError(tr("Failed to write interleaved packet"), r);