[FFmpeg-cvslog] Merge commit '310c55f1799deab395319471a75c528d0fa7b30d'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Thu Mar 23 11:22:32 2017 +0100| [a1f6b1d9d816ad7e6a8f071b0efa2638bc80e65e] | committer: Clément Bœsch

Merge commit '310c55f1799deab395319471a75c528d0fa7b30d'

* commit '310c55f1799deab395319471a75c528d0fa7b30d':
  pixfmt: Document alternative names for smpte 431 and 432

Merged-by: Clément Bœsch <u at pkh.me>

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

 libavutil/pixfmt.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h
index dfb1b11..0c40677 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
 };
 


======================================================================

diff --cc libavutil/pixfmt.h
index dfb1b11,3e040fb..0c40677
--- a/libavutil/pixfmt.h
+++ b/libavutil/pixfmt.h
@@@ -399,21 -304,21 +399,21 @@@ enum AVPixelFormat 
    */
  enum AVColorPrimaries {
      AVCOL_PRI_RESERVED0   = 0,
 -    AVCOL_PRI_BT709       = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 / SMPTE RP177 Annex B
 +    AVCOL_PRI_BT709       = 1,  ///< also ITU-R BT1361 / IEC 61966-2-4 / SMPTE RP177 Annex B
      AVCOL_PRI_UNSPECIFIED = 2,
      AVCOL_PRI_RESERVED    = 3,
 -    AVCOL_PRI_BT470M      = 4, ///< also FCC Title 47 Code of Federal Regulations 73.682 (a)(20)
 +    AVCOL_PRI_BT470M      = 4,  ///< also FCC Title 47 Code of Federal Regulations 73.682 (a)(20)
  
 -    AVCOL_PRI_BT470BG     = 5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM
 -    AVCOL_PRI_SMPTE170M   = 6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC
 -    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_BT470BG     = 5,  ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM
 +    AVCOL_PRI_SMPTE170M   = 6,  ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC
 +    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_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 (2010) / P3 D65 / Display P3
 -    AVCOL_PRI_NB,              ///< Not part of ABI
++    AVCOL_PRI_SMPTE432    = 12, ///< SMPTE ST 432-1 D65 (2010) / P3 D65 / Display P3
 +    AVCOL_PRI_NB                ///< Not part of ABI
  };
  
  /**