Merge commit 'f558f0d2da9426c7f5ba346b5b8e6eb720148362'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Jun 2014 21:29:17 +0000 (23:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Jun 2014 21:34:44 +0000 (23:34 +0200)
commitcd016db4256d5dc9b4a698ac20fa49ff0ff3ce65
tree78051d6a0f808cd71fb701e04ab95b1155886207
parent00acf5c42ae29c5ea071d42987a841731376f596
parentf558f0d2da9426c7f5ba346b5b8e6eb720148362
Merge commit 'f558f0d2da9426c7f5ba346b5b8e6eb720148362'

* commit 'f558f0d2da9426c7f5ba346b5b8e6eb720148362':
  avcodec options: add enum option for color_range

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