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)
commit9e1d97aa066942c3e1ebc72ea51400e831a2005e
tree29074511362c6eea3623d445e32eb03e120f7070
parent58e501b1e9c43ed855b36022e561032476dc8c2a
parentefc2dfe6a0238ec08769626db899ea910be24407
Merge commit 'efc2dfe6a0238ec08769626db899ea910be24407'

* commit 'efc2dfe6a0238ec08769626db899ea910be24407':
  avcodec options: add enum option for color_trc

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