* commit '5d560d38':
  pixfmt: Add ARIB STD-B76 color transfer characteristic

See 785038c9

Conflicts:
    libavcodec/options_table.h
    libavcodec/version.h
    libavutil/pixdesc.c
    libavutil/version.h
Merged-by: James Almer <jamrial@gmail.com>