Обновление ffmpeg git-n6.2-dev-2115-g16128f3c55 и корректировка commit …

…a393aa1.
Aleksoid1978 · Apr 3, 2024 · c2339dd · c2339dd
1 parent a393aa1
commit c2339dd
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 3 deletions.
diff --git a/docs/Changelog.Rus.txt b/docs/Changelog.Rus.txt
@@ -70,7 +70,7 @@ MPC Video Renderer 0.7.3 включен в инсталлятор.
 Обновлены библиотеки:
 	dav1d git-1.4.0-83-g872e470;
 	fdk-aac git-v2.0.3;
-	ffmpeg git-n6.2-dev-2111-g924402f783;
+	ffmpeg git-n6.2-dev-2115-g16128f3c55;
 	Little-CMS git-lcms2.16-41-gfcf6792;
 	MediaInfo git-v24.01-19-gb7bb56e8d;
 	nanosvg git-93ce879;

diff --git a/docs/Changelog.txt b/docs/Changelog.txt
@@ -70,7 +70,7 @@ Updated Romanian translation (by Andrei Miloiu)
 Updated libraries:
 	dav1d git-1.4.0-83-g872e470;
 	fdk-aac git-v2.0.3;
-	ffmpeg git-n6.2-dev-2111-g924402f783;
+	ffmpeg git-n6.2-dev-2115-g16128f3c55;
 	Little-CMS git-lcms2.16-41-gfcf6792;
 	MediaInfo git-v24.01-19-gb7bb56e8d;
 	nanosvg git-93ce879;

diff --git a/src/ExtLib/ffmpeg/libavcodec/options_table.h b/src/ExtLib/ffmpeg/libavcodec/options_table.h
@@ -331,8 +331,11 @@ static const AVOption avcodec_options[] = {
 {"chroma-derived-nc", "Chroma-derived NCL", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_SPC_CHROMA_DERIVED_NCL }, INT_MIN, INT_MAX, V|E|D, .unit = "colorspace_type"},
 {"chroma-derived-c",  "Chroma-derived CL",  0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_SPC_CHROMA_DERIVED_CL },  INT_MIN, INT_MAX, V|E|D, .unit = "colorspace_type"},
 {"ictcp",             "ICtCp",              0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_SPC_ICTCP },              INT_MIN, INT_MAX, V|E|D, .unit = "colorspace_type"},
+{"ipt-c2",            "IPT-C2",             0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_SPC_IPT_C2 },             INT_MIN, INT_MAX, V|E|D, .unit = "colorspace_type"},
 {"unspecified",       "Unspecified",        0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_SPC_UNSPECIFIED },        INT_MIN, INT_MAX, V|E|D, .unit = "colorspace_type"},
 {"ycocg",             "YCGCO",              0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_SPC_YCGCO },              INT_MIN, INT_MAX, V|E|D, .unit = "colorspace_type"},
+{"ycgco-re",          "YCgCo-R, even add.", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_SPC_YCGCO_RE },           INT_MIN, INT_MAX, V|E|D, .unit = "colorspace_type"},
+{"ycgco-ro",          "YCgCo-R, odd add.",  0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_SPC_YCGCO_RO },           INT_MIN, INT_MAX, V|E|D, .unit = "colorspace_type"},
 {"bt2020_ncl",        "BT.2020 NCL",        0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_SPC_BT2020_NCL },         INT_MIN, INT_MAX, V|E|D, .unit = "colorspace_type"},
 {"bt2020_cl",         "BT.2020 CL",         0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_SPC_BT2020_CL },          INT_MIN, INT_MAX, V|E|D, .unit = "colorspace_type"},
 {"color_range", "color range", OFFSET(color_range), AV_OPT_TYPE_INT, {.i64 = AVCOL_RANGE_UNSPECIFIED }, 0, INT_MAX, V|E|D, .unit = "color_range_type"},

diff --git a/src/ExtLib/ffmpeg/libavfilter/version.h b/src/ExtLib/ffmpeg/libavfilter/version.h
@@ -32,7 +32,7 @@
 #include "version_major.h"
 
 #define LIBAVFILTER_VERSION_MINOR   2
-#define LIBAVFILTER_VERSION_MICRO 100
+#define LIBAVFILTER_VERSION_MICRO 101
 
 
 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \

diff --git a/src/ExtLib/ffmpeg/libavutil/pixdesc.c b/src/ExtLib/ffmpeg/libavutil/pixdesc.c
@@ -2854,6 +2854,9 @@ static const char * const color_space_names[] = {
     [AVCOL_SPC_CHROMA_DERIVED_NCL] = "chroma-derived-nc",
     [AVCOL_SPC_CHROMA_DERIVED_CL] = "chroma-derived-c",
     [AVCOL_SPC_ICTCP] = "ictcp",
+    [AVCOL_SPC_IPT_C2] = "ipt-c2",
+    [AVCOL_SPC_YCGCO_RE] = "ycgco-re",
+    [AVCOL_SPC_YCGCO_RO] = "ycgco-ro",
 };
 
 static const char * const chroma_location_names[] = {

diff --git a/src/ExtLib/ffmpeg/libavutil/pixfmt.h b/src/ExtLib/ffmpeg/libavutil/pixfmt.h
@@ -623,6 +623,9 @@ enum AVColorSpace {
     AVCOL_SPC_CHROMA_DERIVED_NCL = 12, ///< Chromaticity-derived non-constant luminance system
     AVCOL_SPC_CHROMA_DERIVED_CL = 13, ///< Chromaticity-derived constant luminance system
     AVCOL_SPC_ICTCP       = 14, ///< ITU-R BT.2100-0, ICtCp
+    AVCOL_SPC_IPT_C2      = 15, ///< SMPTE ST 2128, IPT-C2
+    AVCOL_SPC_YCGCO_RE    = 16, ///< YCgCo-R, even addition of bits
+    AVCOL_SPC_YCGCO_RO    = 17, ///< YCgCo-R, odd addition of bits
     AVCOL_SPC_NB                ///< Not part of ABI
 };