* commit '04ccd584a70fad4ebb29ca340d704970ff313cbc': pixfmt: mark further reserved values Conflicts: libavutil/version.h
Unified · Split
| @@ -433,6 +433,7 @@ enum AVPixelFormat { · 432 unmodified lines | |||
| 433 | * Chromaticity coordinates of the source primaries. | 433 | * Chromaticity coordinates of the source primaries. |
| 434 | */ | 434 | */ |
| 435 | enum AVColorPrimaries { | 435 | enum AVColorPrimaries { |
| 436 | AVCOL_PRI_RESERVED0 = 0, | ||
| 436 | AVCOL_PRI_BT709 = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 / SMPTE RP177 Annex B | 437 | AVCOL_PRI_BT709 = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 / SMPTE RP177 Annex B |
| 437 | AVCOL_PRI_UNSPECIFIED = 2, | 438 | AVCOL_PRI_UNSPECIFIED = 2, |
| 438 | AVCOL_PRI_RESERVED = 3, | 439 | AVCOL_PRI_RESERVED = 3, |
| @@ -450,6 +451,7 @@ enum AVColorPrimaries { · 11 unmodified lines | |||
| 450 | * Color Transfer Characteristic. | 451 | * Color Transfer Characteristic. |
| 451 | */ | 452 | */ |
| 452 | enum AVColorTransferCharacteristic { | 453 | enum AVColorTransferCharacteristic { |
| 454 | AVCOL_TRC_RESERVED0 = 0, | ||
| 453 | AVCOL_TRC_BT709 = 1, ///< also ITU-R BT1361 | 455 | AVCOL_TRC_BT709 = 1, ///< also ITU-R BT1361 |
| 454 | AVCOL_TRC_UNSPECIFIED = 2, | 456 | AVCOL_TRC_UNSPECIFIED = 2, |
| 455 | AVCOL_TRC_RESERVED = 3, | 457 | AVCOL_TRC_RESERVED = 3, |
| @@ -57,7 +57,7 @@ · 56 unmodified lines | |||
| 57 | 57 | ||
| 58 | #define LIBAVUTIL_VERSION_MAJOR 54 | 58 | #define LIBAVUTIL_VERSION_MAJOR 54 |
| 59 | #define LIBAVUTIL_VERSION_MINOR 9 | 59 | #define LIBAVUTIL_VERSION_MINOR 9 |
| 60 | #define LIBAVUTIL_VERSION_MICRO 100 | 60 | #define LIBAVUTIL_VERSION_MICRO 101 |
| 61 | 61 | ||
| 62 | #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ | 62 | #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |
| 63 | LIBAVUTIL_VERSION_MINOR, \ | 63 | LIBAVUTIL_VERSION_MINOR, \ |