Merge commit '7c29b7229bedf0c37d09bd02dab88e563adffd3c'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Jun 2014 21:19:41 +0000 (23:19 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Jun 2014 21:19:45 +0000 (23:19 +0200)
commit00acf5c42ae29c5ea071d42987a841731376f596
treea07e07bf2cccf4a8e6337863754fbf61d521d1a6
parent9e1d97aa066942c3e1ebc72ea51400e831a2005e
parent7c29b7229bedf0c37d09bd02dab88e563adffd3c
Merge commit '7c29b7229bedf0c37d09bd02dab88e563adffd3c'

* commit '7c29b7229bedf0c37d09bd02dab88e563adffd3c':
  avcodec options: add enum option for colorspace

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