Merge commit 'efc2dfe6a0238ec08769626db899ea910be24407'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Jun 2014 21:09:22 +0000 (23:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Jun 2014 21:09:26 +0000 (23:09 +0200)
* commit 'efc2dfe6a0238ec08769626db899ea910be24407':
  avcodec options: add enum option for color_trc

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

Simple merge