Merge commit '5d560d38deca1e4705e6d3784d737363b9c830fe'
authorJames Almer <jamrial@gmail.com>
Wed, 28 Sep 2016 16:09:26 +0000 (13:09 -0300)
committerJames Almer <jamrial@gmail.com>
Wed, 28 Sep 2016 16:09:26 +0000 (13:09 -0300)
commitf013ba475b0dbf71e2804c57e67bf308ae636f2b
tree4b6476c2ab67903e03a41afb115136fbc269338c
parent3597d32e88c8e0c6e6f25fe73a9ebd235c879c2b
parent5d560d38deca1e4705e6d3784d737363b9c830fe
Merge commit '5d560d38deca1e4705e6d3784d737363b9c830fe'

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

See 785038c92cc7fc1da437576382083246ca598fce

Conflicts:
    libavcodec/options_table.h
    libavcodec/version.h
    libavutil/pixdesc.c
    libavutil/version.h

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