OSDN Git Service

Merge commit 'ec89f35e3e5eb9ec5221266e801efeee7ecab4df'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 15 Apr 2015 09:57:00 +0000 (11:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 15 Apr 2015 09:57:38 +0000 (11:57 +0200)
commit0842df2619a005ae8b02a2759a955e2e1248cd55
tree49ec28098059ba1fdd4ac829286da6bc4a0cbda6
parent0fbe18b63eab17562bea4b98df8307ba3a90686b
parentec89f35e3e5eb9ec5221266e801efeee7ecab4df
Merge commit 'ec89f35e3e5eb9ec5221266e801efeee7ecab4df'

* commit 'ec89f35e3e5eb9ec5221266e801efeee7ecab4df':
  x265: Map color parameters

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/libx265.c