Merge commit 'bd71c300f9ba7f9875bb5df17ce522e9128bae10'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Jun 2014 21:00:09 +0000 (23:00 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Jun 2014 21:01:31 +0000 (23:01 +0200)
commit58e501b1e9c43ed855b36022e561032476dc8c2a
treeafdbe579ef656fd1bfe7e614c10b1e2eb535a821
parent3b42a8e43924b9dd160e5e3f30d883a45aff3299
parentbd71c300f9ba7f9875bb5df17ce522e9128bae10
Merge commit 'bd71c300f9ba7f9875bb5df17ce522e9128bae10'

* commit 'bd71c300f9ba7f9875bb5df17ce522e9128bae10':
  avcodec options: add enum option for color_primaries

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