[FFmpeg-cvslog] doc/codecs.texi: fix and expand color related options

James Almer git at videolan.org
Thu Sep 29 01:34:13 EEST 2016


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Wed Sep 28 17:14:33 2016 -0300| [a68f1ae6b1f2f80dff59d5dd5f806e2107c0c540] | committer: James Almer

doc/codecs.texi: fix and expand color related options

Found-by: Michael Niedermayer <michael at niedermayer.cc>
Reviewed-by: Michael Niedermayer <michael at niedermayer.cc>
Signed-off-by: James Almer <jamrial at gmail.com>

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

 doc/codecs.texi | 73 +++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 63 insertions(+), 10 deletions(-)

diff --git a/doc/codecs.texi b/doc/codecs.texi
index 48fc3bf..913e257 100644
--- a/doc/codecs.texi
+++ b/doc/codecs.texi
@@ -1049,7 +1049,31 @@ Possible values:
 @item rc_max_vbv_use @var{float} (@emph{encoding,video})
 @item rc_min_vbv_use @var{float} (@emph{encoding,video})
 @item ticks_per_frame @var{integer} (@emph{decoding/encoding,audio,video})
+
 @item color_primaries @var{integer} (@emph{decoding/encoding,video})
+Possible values:
+ at table @samp
+ at item bt709
+BT.709
+ at item bt470m
+BT.470 M
+ at item bt470bg
+BT.470 BG
+ at item smpte170m
+SMPTE 170 M
+ at item smpte240m
+SMPTE 240 M
+ at item film
+Film
+ at item bt2020
+BT.2020
+ at item smpte428_1
+SMPTE ST 428-1
+ at item smpte431
+SMPTE 431-2
+ at item smpte432
+SMPTE 432-1
+ at end table
 
 @item color_trc @var{integer} (@emph{decoding/encoding,video})
 Possible values:
@@ -1060,29 +1084,58 @@ BT.709
 BT.470 M
 @item gamma28
 BT.470 BG
- at item linear
+ at item smpte170m
 SMPTE 170 M
- at item log
+ at item smpte240m
 SMPTE 240 M
- at item log_sqrt
+ at item linear
 Linear
- at item iec61966_2_4
+ at item log
 Log
- at item bt1361
+ at item log_sqrt
 Log square root
- at item iec61966_2_1
+ at item iec61966_2_4
 IEC 61966-2-4
- at item bt2020_10bit
+ at item bt1361
 BT.1361
- at item bt2020_12bit
+ at item iec61966_2_1
 IEC 61966-2-1
- at item smpte2084
+ at item bt2020_10bit
 BT.2020 - 10 bit
- at item smpte428_1
+ at item bt2020_12bit
 BT.2020 - 12 bit
+ at item smpte2084
+SMPTE ST 2084
+ at item smpte428_1
+SMPTE ST 428-1
+ at item arib-std-b67
+ARIB STD-B67
 @end table
 
 @item colorspace @var{integer} (@emph{decoding/encoding,video})
+Possible values:
+ at table @samp
+ at item rgb
+RGB
+ at item bt709
+BT.709
+ at item fcc
+FCC
+ at item bt470bg
+BT.470 BG
+ at item smpte170m
+SMPTE 170 M
+ at item smpte240m
+SMPTE 240 M
+ at item ycocg
+YCOCG
+ at item bt2020_ncl
+BT.2020 NCL
+ at item bt2020_cl
+BT.2020 CL
+ at item smpte2085
+SMPTE 2085
+ at end table
 
 @item color_range @var{integer} (@emph{decoding/encoding,video})
 If used as input parameter, it serves as a hint to the decoder, which



More information about the ffmpeg-cvslog mailing list