diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-13 18:32:07 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-13 18:35:28 +0100 |
| commit | 2d7cf6f72ba20479109799e4cc9169b95e1b643d (patch) | |
| tree | 353301a565126b196688eb1c692bed1da4f5a1e9 /libavutil/pixdesc.c | |
| parent | 724a71dced1c211fc64105ec9f1fb99d79f6ff35 (diff) | |
| parent | f172e22d6aed0bff36e975bafb0183b6779f9444 (diff) | |
| download | ffmpeg-2d7cf6f72ba20479109799e4cc9169b95e1b643d.tar.gz | |
Merge commit 'f172e22d6aed0bff36e975bafb0183b6779f9444'
* commit 'f172e22d6aed0bff36e975bafb0183b6779f9444':
pixdesc: Add aliases to SMPTE color properties
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavutil/pixdesc.c')
| -rw-r--r-- | libavutil/pixdesc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index f104091861..0114037d62 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -2135,7 +2135,7 @@ static const char *color_primaries_names[AVCOL_PRI_NB] = { [AVCOL_PRI_SMPTE240M] = "smpte240m", [AVCOL_PRI_FILM] = "film", [AVCOL_PRI_BT2020] = "bt2020", - [AVCOL_PRI_SMPTEST428_1] = "smpte428-1", + [AVCOL_PRI_SMPTE428] = "smpte428", [AVCOL_PRI_SMPTE431] = "smpte431", [AVCOL_PRI_SMPTE432] = "smpte432", }; @@ -2157,8 +2157,8 @@ static const char *color_transfer_names[] = { [AVCOL_TRC_IEC61966_2_1] = "iec61966-2-1", [AVCOL_TRC_BT2020_10] = "bt2020-10", [AVCOL_TRC_BT2020_12] = "bt2020-20", - [AVCOL_TRC_SMPTEST2084] = "smpte2084", - [AVCOL_TRC_SMPTEST428_1] = "smpte428-1", + [AVCOL_TRC_SMPTE2084] = "smpte2084", + [AVCOL_TRC_SMPTE428] = "smpte428", [AVCOL_TRC_ARIB_STD_B67] = "arib-std-b67", }; |