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)
* commit '7c29b7229bedf0c37d09bd02dab88e563adffd3c':
  avcodec options: add enum option for colorspace

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

Simple merge