Merge commit '7a745f014f528d1001394ae4d2f4ed1a20bf7fa2'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 13 Nov 2016 21:29:04 +0000 (22:29 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 13 Nov 2016 21:29:04 +0000 (22:29 +0100)
commitbd0db4a32d85d027da4d4dc00490c20048090312
treec52930944267101abec82ddca94b06922aa85516
parent775a8477b74bb2fa95ca2b13c08f3fd8d6c617b6
parent7a745f014f528d1001394ae4d2f4ed1a20bf7fa2
Merge commit '7a745f014f528d1001394ae4d2f4ed1a20bf7fa2'

* commit '7a745f014f528d1001394ae4d2f4ed1a20bf7fa2':
  options_table: Add aliases for color properties

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/options_table.h
libavcodec/version.h