Merge commit '444a36269f853844369af0a9836507e5a2780323'

* commit '444a36269f853844369af0a9836507e5a2780323': pixdesc: Fix AVCOL_TRC_BT2020_12 name Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
8 years ago · 411ecb0be6
parent 2d7cf6f72b 444a36269f
commit 411ecb0be6
1 changed files with 1 additions and 1 deletions
--- 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",