ffmpeg | branch: master | Hendrik Leppkes <h.lepp...@gmail.com> | Sun Nov 13 18:38:16 2016 +0100| [411ecb0be66415c74e4bc8ad26e450d5362d2f5c] | committer: Hendrik Leppkes
Merge commit '444a36269f853844369af0a9836507e5a2780323' * commit '444a36269f853844369af0a9836507e5a2780323': pixdesc: Fix AVCOL_TRC_BT2020_12 name Merged-by: Hendrik Leppkes <h.lepp...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=411ecb0be66415c74e4bc8ad26e450d5362d2f5c --- libavutil/pixdesc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index 0114037..73474be 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", ====================================================================== _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
