diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-23 11:22:32 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-23 11:22:32 +0100 |
| commit | a1f6b1d9d816ad7e6a8f071b0efa2638bc80e65e (patch) | |
| tree | 375f0405f96f79727f303c6feed212a75ad1318b | |
| parent | 1a5631dc716e61cb3fa60bf44b93c4ca5438f7c9 (diff) | |
| parent | 310c55f1799deab395319471a75c528d0fa7b30d (diff) | |
| download | ffmpeg-a1f6b1d9d816ad7e6a8f071b0efa2638bc80e65e.tar.gz | |
Merge commit '310c55f1799deab395319471a75c528d0fa7b30d'
* commit '310c55f1799deab395319471a75c528d0fa7b30d':
pixfmt: Document alternative names for smpte 431 and 432
Merged-by: Clément Bœsch <u@pkh.me>
| -rw-r--r-- | libavutil/pixfmt.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index dfb1b1103b..0c406775ef 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -411,8 +411,8 @@ enum AVColorPrimaries { AVCOL_PRI_BT2020 = 9, ///< ITU-R BT2020 AVCOL_PRI_SMPTE428 = 10, ///< SMPTE ST 428-1 (CIE 1931 XYZ) AVCOL_PRI_SMPTEST428_1 = AVCOL_PRI_SMPTE428, - AVCOL_PRI_SMPTE431 = 11, ///< SMPTE ST 431-2 (2011) - AVCOL_PRI_SMPTE432 = 12, ///< SMPTE ST 432-1 D65 (2010) + AVCOL_PRI_SMPTE431 = 11, ///< SMPTE ST 431-2 (2011) / DCI P3 + AVCOL_PRI_SMPTE432 = 12, ///< SMPTE ST 432-1 D65 (2010) / P3 D65 / Display P3 AVCOL_PRI_NB ///< Not part of ABI }; |