subject:"\[FFmpeg\-cvslog\] Merge commit 'a8164323374e86ce5f93759230868c98356833a2'"

Re: [FFmpeg-cvslog] Merge commit 'a8164323374e86ce5f93759230868c98356833a2'

2016-09-28 Thread Michael Niedermayer

On Wed, Sep 28, 2016 at 06:15:03PM +0200, James Almer wrote:
> ffmpeg | branch: master | James Almer  | Wed Sep 28 
> 13:12:18 2016 -0300| [6e76c9c45018b9cea383ff1c3f17d08792623509] | committer: 
> James Almer
> 
> Merge commit 'a8164323374e86ce5f93759230868c98356833a2'
> 
> * commit 'a8164323374e86ce5f93759230868c98356833a2':
>   pixdesc: Add new SMPTE 431, 432, and 2085 color properties
> 
> Conflicts:
> libavcodec/options_table.h
> libavcodec/version.h
> libavutil/pixdesc.c
> libavutil/pixfmt.h
> libavutil/version.h
> 
> Merged-by: James Almer 
> 
> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6e76c9c45018b9cea383ff1c3f17d08792623509
> ---
> 
>  libavcodec/options_table.h | 3 +++
>  libavcodec/version.h   | 2 +-
>  libavutil/pixdesc.c| 3 +++
>  libavutil/pixfmt.h | 5 -
>  libavutil/version.h| 2 +-
>  5 files changed, 12 insertions(+), 3 deletions(-)
> 
> diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
> index 88dee61..995906b 100644
> --- a/libavcodec/options_table.h
> +++ b/libavcodec/options_table.h
> @@ -460,6 +460,8 @@ static const AVOption avcodec_options[] = {
>  {"film","Film",   0, AV_OPT_TYPE_CONST, {.i64 = 
> AVCOL_PRI_FILM }, INT_MIN, INT_MAX, V|E|D, "color_primaries_type"},
>  {"bt2020",  "BT.2020",0, AV_OPT_TYPE_CONST, {.i64 = 
> AVCOL_PRI_BT2020 },   INT_MIN, INT_MAX, V|E|D, "color_primaries_type"},
>  {"smpte428_1",  "SMPTE ST 428-1", 0, AV_OPT_TYPE_CONST, {.i64 = 
> AVCOL_PRI_SMPTEST428_1 }, INT_MIN, INT_MAX, V|E|D, "color_primaries_type"},
> +{"smpte431","SMPTE 431-2",0, AV_OPT_TYPE_CONST, {.i64 = 
> AVCOL_PRI_SMPTE431 }, INT_MIN, INT_MAX, V|E|D, "color_primaries_type"},
> +{"smpte432","SMPTE 422-1",0, AV_OPT_TYPE_CONST, {.i64 = 
> AVCOL_PRI_SMPTE432 }, INT_MIN, INT_MAX, V|E|D, "color_primaries_type"},
>  {"color_trc", "color transfer characteristics", OFFSET(color_trc), 
> AV_OPT_TYPE_INT, {.i64 = AVCOL_TRC_UNSPECIFIED }, 1, AVCOL_TRC_NB-1, V|E|D, 
> "color_trc_type"},
>  {"bt709","BT.709",   0, AV_OPT_TYPE_CONST, {.i64 = 
> AVCOL_TRC_BT709 },INT_MIN, INT_MAX, V|E|D, "color_trc_type"},
>  {"unspecified",  "Unspecified",  0, AV_OPT_TYPE_CONST, {.i64 = 
> AVCOL_TRC_UNSPECIFIED },  INT_MIN, INT_MAX, V|E|D, "color_trc_type"},
> @@ -489,6 +491,7 @@ static const AVOption avcodec_options[] = {
>  {"ycocg",   "YCOCG",   0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_SPC_YCOCG 
> },   INT_MIN, INT_MAX, V|E|D, "colorspace_type"},
>  {"bt2020_ncl",  "BT.2020 NCL", 0, AV_OPT_TYPE_CONST, {.i64 = 
> AVCOL_SPC_BT2020_NCL },  INT_MIN, INT_MAX, V|E|D, "colorspace_type"},
>  {"bt2020_cl",   "BT.2020 CL",  0, AV_OPT_TYPE_CONST, {.i64 = 
> AVCOL_SPC_BT2020_CL },   INT_MIN, INT_MAX, V|E|D, "colorspace_type"},
> +{"smpte2085",   "SMPTE 2085",  0, AV_OPT_TYPE_CONST, {.i64 = 
> AVCOL_SPC_SMPTE2085 },   INT_MIN, INT_MAX, V|E|D, "colorspace_type"},
>  {"color_range", "color range", OFFSET(color_range), AV_OPT_TYPE_INT, {.i64 = 
> AVCOL_RANGE_UNSPECIFIED }, 0, AVCOL_RANGE_NB-1, V|E|D, "color_range_type"},
>  {"unspecified", "Unspecified", 0, AV_OPT_TYPE_CONST, {.i64 = 
> AVCOL_RANGE_UNSPECIFIED }, INT_MIN, INT_MAX, V|E|D, "color_range_type"},
>  {"mpeg", "MPEG (219*2^(n-8))", 0, AV_OPT_TYPE_CONST, {.i64 = 
> AVCOL_RANGE_MPEG },INT_MIN, INT_MAX, V|E|D, "color_range_type"},

Missing changes to doc/
also the need to update doc/ should be mentioned in doc/libav-merge.txt

[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

No snowflake in an avalanche ever feels responsible. -- Voltaire


signature.asc
Description: Digital signature
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Merge commit 'a8164323374e86ce5f93759230868c98356833a2'

2016-09-28 Thread James Almer

ffmpeg | branch: master | James Almer  | Wed Sep 28 13:12:18 
2016 -0300| [6e76c9c45018b9cea383ff1c3f17d08792623509] | committer: James Almer

Merge commit 'a8164323374e86ce5f93759230868c98356833a2'

* commit 'a8164323374e86ce5f93759230868c98356833a2':
  pixdesc: Add new SMPTE 431, 432, and 2085 color properties

Conflicts:
libavcodec/options_table.h
libavcodec/version.h
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h

Merged-by: James Almer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6e76c9c45018b9cea383ff1c3f17d08792623509
---

 libavcodec/options_table.h | 3 +++
 libavcodec/version.h   | 2 +-
 libavutil/pixdesc.c| 3 +++
 libavutil/pixfmt.h | 5 -
 libavutil/version.h| 2 +-
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index 88dee61..995906b 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -460,6 +460,8 @@ static const AVOption avcodec_options[] = {
 {"film","Film",   0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_PRI_FILM 
}, INT_MIN, INT_MAX, V|E|D, "color_primaries_type"},
 {"bt2020",  "BT.2020",0, AV_OPT_TYPE_CONST, {.i64 = 
AVCOL_PRI_BT2020 },   INT_MIN, INT_MAX, V|E|D, "color_primaries_type"},
 {"smpte428_1",  "SMPTE ST 428-1", 0, AV_OPT_TYPE_CONST, {.i64 = 
AVCOL_PRI_SMPTEST428_1 }, INT_MIN, INT_MAX, V|E|D, "color_primaries_type"},
+{"smpte431","SMPTE 431-2",0, AV_OPT_TYPE_CONST, {.i64 = 
AVCOL_PRI_SMPTE431 }, INT_MIN, INT_MAX, V|E|D, "color_primaries_type"},
+{"smpte432","SMPTE 422-1",0, AV_OPT_TYPE_CONST, {.i64 = 
AVCOL_PRI_SMPTE432 }, INT_MIN, INT_MAX, V|E|D, "color_primaries_type"},
 {"color_trc", "color transfer characteristics", OFFSET(color_trc), 
AV_OPT_TYPE_INT, {.i64 = AVCOL_TRC_UNSPECIFIED }, 1, AVCOL_TRC_NB-1, V|E|D, 
"color_trc_type"},
 {"bt709","BT.709",   0, AV_OPT_TYPE_CONST, {.i64 = 
AVCOL_TRC_BT709 },INT_MIN, INT_MAX, V|E|D, "color_trc_type"},
 {"unspecified",  "Unspecified",  0, AV_OPT_TYPE_CONST, {.i64 = 
AVCOL_TRC_UNSPECIFIED },  INT_MIN, INT_MAX, V|E|D, "color_trc_type"},
@@ -489,6 +491,7 @@ static const AVOption avcodec_options[] = {
 {"ycocg",   "YCOCG",   0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_SPC_YCOCG 
},   INT_MIN, INT_MAX, V|E|D, "colorspace_type"},
 {"bt2020_ncl",  "BT.2020 NCL", 0, AV_OPT_TYPE_CONST, {.i64 = 
AVCOL_SPC_BT2020_NCL },  INT_MIN, INT_MAX, V|E|D, "colorspace_type"},
 {"bt2020_cl",   "BT.2020 CL",  0, AV_OPT_TYPE_CONST, {.i64 = 
AVCOL_SPC_BT2020_CL },   INT_MIN, INT_MAX, V|E|D, "colorspace_type"},
+{"smpte2085",   "SMPTE 2085",  0, AV_OPT_TYPE_CONST, {.i64 = 
AVCOL_SPC_SMPTE2085 },   INT_MIN, INT_MAX, V|E|D, "colorspace_type"},
 {"color_range", "color range", OFFSET(color_range), AV_OPT_TYPE_INT, {.i64 = 
AVCOL_RANGE_UNSPECIFIED }, 0, AVCOL_RANGE_NB-1, V|E|D, "color_range_type"},
 {"unspecified", "Unspecified", 0, AV_OPT_TYPE_CONST, {.i64 = 
AVCOL_RANGE_UNSPECIFIED }, INT_MIN, INT_MAX, V|E|D, "color_range_type"},
 {"mpeg", "MPEG (219*2^(n-8))", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_RANGE_MPEG 
},INT_MIN, INT_MAX, V|E|D, "color_range_type"},
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 5889879..c583da0 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -29,7 +29,7 @@
 
 #define LIBAVCODEC_VERSION_MAJOR  57
 #define LIBAVCODEC_VERSION_MINOR  58
-#define LIBAVCODEC_VERSION_MICRO 103
+#define LIBAVCODEC_VERSION_MICRO 104
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c
index a147a2d..b715fce 100644
--- a/libavutil/pixdesc.c
+++ b/libavutil/pixdesc.c
@@ -2115,6 +2115,8 @@ static const char *color_primaries_names[AVCOL_PRI_NB] = {
 [AVCOL_PRI_FILM] = "film",
 [AVCOL_PRI_BT2020] = "bt2020",
 [AVCOL_PRI_SMPTEST428_1] = "smpte428-1",
+[AVCOL_PRI_SMPTE431] = "smpte431",
+[AVCOL_PRI_SMPTE432] = "smpte432",
 };
 
 static const char *color_transfer_names[] = {
@@ -2151,6 +2153,7 @@ static const char *color_space_names[] = {
 [AVCOL_SPC_YCOCG] = "ycgco",
 [AVCOL_SPC_BT2020_NCL] = "bt2020nc",
 [AVCOL_SPC_BT2020_CL] = "bt2020c",
+[AVCOL_SPC_SMPTE2085] = "smpte2085",
 };
 
 static const char *chroma_location_names[] = {
diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h
index 6f71ac0..6511f18 100644
--- a/libavutil/pixfmt.h
+++ b/libavutil/pixfmt.h
@@ -400,7 +400,9 @@ enum AVColorPrimaries {
 AVCOL_PRI_SMPTE240M   = 7,  ///< functionally identical to above
 AVCOL_PRI_FILM= 8,  ///< colour filters using Illuminant C
 AVCOL_PRI_BT2020  = 9,  ///< ITU-R BT2020
-AVCOL_PRI_SMPTEST428_1= 10, ///< SMPTE ST 428-1 (CIE 1931 XYZ)
+AVCOL_PRI_SMPTEST428_1 = 10, ///< SMPTE ST 428-1 (CIE 1931 XYZ)
+

Re: [FFmpeg-cvslog] Merge commit 'a8164323374e86ce5f93759230868c98356833a2'

[FFmpeg-cvslog] Merge commit 'a8164323374e86ce5f93759230868c98356833a2'

2 matches

Site Navigation

Mail list logo

Footer information