ffmpeg | branch: master | James Almer <jamr...@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 <mich...@niedermayer.cc>
Reviewed-by: Michael Niedermayer <mich...@niedermayer.cc>
Signed-off-by: James Almer <jamr...@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:
+@table @samp
+@item bt709
+BT.709
+@item bt470m
+BT.470 M
+@item bt470bg
+BT.470 BG
+@item smpte170m
+SMPTE 170 M
+@item smpte240m
+SMPTE 240 M
+@item film
+Film
+@item bt2020
+BT.2020
+@item smpte428_1
+SMPTE ST 428-1
+@item smpte431
+SMPTE 431-2
+@item smpte432
+SMPTE 432-1
+@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
-@item linear
+@item smpte170m
 SMPTE 170 M
-@item log
+@item smpte240m
 SMPTE 240 M
-@item log_sqrt
+@item linear
 Linear
-@item iec61966_2_4
+@item log
 Log
-@item bt1361
+@item log_sqrt
 Log square root
-@item iec61966_2_1
+@item iec61966_2_4
 IEC 61966-2-4
-@item bt2020_10bit
+@item bt1361
 BT.1361
-@item bt2020_12bit
+@item iec61966_2_1
 IEC 61966-2-1
-@item smpte2084
+@item bt2020_10bit
 BT.2020 - 10 bit
-@item smpte428_1
+@item bt2020_12bit
 BT.2020 - 12 bit
+@item smpte2084
+SMPTE ST 2084
+@item smpte428_1
+SMPTE ST 428-1
+@item arib-std-b67
+ARIB STD-B67
 @end table
 
 @item colorspace @var{integer} (@emph{decoding/encoding,video})
+Possible values:
+@table @samp
+@item rgb
+RGB
+@item bt709
+BT.709
+@item fcc
+FCC
+@item bt470bg
+BT.470 BG
+@item smpte170m
+SMPTE 170 M
+@item smpte240m
+SMPTE 240 M
+@item ycocg
+YCOCG
+@item bt2020_ncl
+BT.2020 NCL
+@item bt2020_cl
+BT.2020 CL
+@item smpte2085
+SMPTE 2085
+@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

_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to