diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-13 18:38:16 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-13 18:38:16 +0100 |
| commit | 411ecb0be66415c74e4bc8ad26e450d5362d2f5c (patch) | |
| tree | fb42ff296a9d71562d054842cc7220451534f326 /libavutil | |
| parent | 2d7cf6f72ba20479109799e4cc9169b95e1b643d (diff) | |
| parent | 444a36269f853844369af0a9836507e5a2780323 (diff) | |
| download | ffmpeg-411ecb0be66415c74e4bc8ad26e450d5362d2f5c.tar.gz | |
Merge commit '444a36269f853844369af0a9836507e5a2780323'
* commit '444a36269f853844369af0a9836507e5a2780323':
pixdesc: Fix AVCOL_TRC_BT2020_12 name
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/pixdesc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index 0114037d62..73474be7d6 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -2156,7 +2156,7 @@ static const char *color_transfer_names[] = { [AVCOL_TRC_BT1361_ECG] = "bt1361e", [AVCOL_TRC_IEC61966_2_1] = "iec61966-2-1", [AVCOL_TRC_BT2020_10] = "bt2020-10", - [AVCOL_TRC_BT2020_12] = "bt2020-20", + [AVCOL_TRC_BT2020_12] = "bt2020-12", [AVCOL_TRC_SMPTE2084] = "smpte2084", [AVCOL_TRC_SMPTE428] = "smpte428", [AVCOL_TRC_ARIB_STD_B67] = "arib-std-b67", |