[SCM] libav/experimental: pixfmt: mark the reserved values

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Aug 10 16:03:36 UTC 2014


The following commit has been merged in the experimental branch:
commit ab72eda15e98197cf148abc08574206cfde0d9b0
Author: Vittorio Giovara <vittorio.giovara at gmail.com>
Date:   Mon Jun 23 17:39:03 2014 -0400

    pixfmt: mark the reserved values

diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h
index 1f63eb0..29207d2 100644
--- a/libavutil/pixfmt.h
+++ b/libavutil/pixfmt.h
@@ -298,6 +298,7 @@ enum AVPixelFormat {
 enum AVColorPrimaries {
     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,
     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
@@ -313,6 +314,7 @@ enum AVColorPrimaries {
 enum AVColorTransferCharacteristic {
     AVCOL_TRC_BT709        = 1,  ///< also ITU-R BT1361
     AVCOL_TRC_UNSPECIFIED  = 2,
+    AVCOL_TRC_RESERVED     = 3,
     AVCOL_TRC_GAMMA22      = 4,  ///< also ITU-R BT470M / ITU-R BT1700 625 PAL & SECAM
     AVCOL_TRC_GAMMA28      = 5,  ///< also ITU-R BT470BG
     AVCOL_TRC_SMPTE170M    = 6,  ///< also ITU-R BT601-6 525 or 625 / ITU-R BT1358 525 or 625 / ITU-R BT1700 NTSC
@@ -335,6 +337,7 @@ enum AVColorSpace {
     AVCOL_SPC_RGB         = 0,
     AVCOL_SPC_BT709       = 1,  ///< also ITU-R BT1361 / IEC 61966-2-4 xvYCC709 / SMPTE RP177 Annex B
     AVCOL_SPC_UNSPECIFIED = 2,
+    AVCOL_SPC_RESERVED    = 3,
     AVCOL_SPC_FCC         = 4,
     AVCOL_SPC_BT470BG     = 5,  ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM / IEC 61966-2-4 xvYCC601
     AVCOL_SPC_SMPTE170M   = 6,  ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC / functionally identical to above
diff --git a/libavutil/version.h b/libavutil/version.h
index a4384b3..ef38404 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -55,7 +55,7 @@
 
 #define LIBAVUTIL_VERSION_MAJOR 53
 #define LIBAVUTIL_VERSION_MINOR 17
-#define LIBAVUTIL_VERSION_MICRO  0
+#define LIBAVUTIL_VERSION_MICRO  1
 
 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
                                                LIBAVUTIL_VERSION_MINOR, \

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list