Merge commit '17dac56b8fdd80c594c39b76de3f27a7949afbde'
authorClément Bœsch <cboesch@gopro.com>
Fri, 31 Mar 2017 07:46:51 +0000 (09:46 +0200)
committerClément Bœsch <cboesch@gopro.com>
Fri, 31 Mar 2017 07:46:51 +0000 (09:46 +0200)
commit82ad9cbd32c873bced9adf4a2bb67dcda7294c61
treed0e5060083ecacf967ff24be7bcad46e58e1a82f
parent1ea0df14c367d7c6584b4bcbc2aaae5acc685634
parent17dac56b8fdd80c594c39b76de3f27a7949afbde
Merge commit '17dac56b8fdd80c594c39b76de3f27a7949afbde'

* commit '17dac56b8fdd80c594c39b76de3f27a7949afbde':
  lavu: Rename ycgco color space appropriately

Merged-by: Clément Bœsch <cboesch@gopro.com>
libavcodec/options_table.h
libavcodec/version.h
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h