Merge branch 'refs/heads/dev' into plugin

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

app/codec/ffmpeg/ffmpegdecoder.h

@@ -40,6 +40,20 @@ extern "C" {
 namespace olive
 {
 
+// 头文件里先备好枚举映射
+static VideoParams::Interlacing FFmpegFieldOrderToOlive(AVFieldOrder fo)
+{
+	switch (fo) {
+	case AV_FIELD_TT:          // 隔行，顶场在前
+		return VideoParams::kInterlacedTopFirst;
+	case AV_FIELD_BB:          // 隔行，底场在前
+		return VideoParams::kInterlacedBottomFirst;
+	case AV_FIELD_PROGRESSIVE:
+	default:
+		return VideoParams::kInterlaceNone;
+	}
+}
+
 /**
  * @brief A Decoder derivative that wraps FFmpeg functions as on Olive decoder
  */
@@ -122,6 +136,10 @@ private:
 		{
 			return avstream_;
 		}
+		AVCodecContext *codec_ctx()
+		{
+			return codec_ctx_;
+		}
 
 	private:
 		AVFormatContext *fmt_ctx_;