Merge commit '9d5fed6dc4cccb0689f694112f5026988bebc472'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Oct 2014 00:13:37 +0000 (02:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Oct 2014 00:14:23 +0000 (02:14 +0200)
* commit '9d5fed6dc4cccb0689f694112f5026988bebc472':
  avcodec: fix descriptions on color transfer options

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/options_table.h

Simple merge