diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-15 11:57:00 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-15 11:57:38 +0200 |
commit | 0842df2619a005ae8b02a2759a955e2e1248cd55 (patch) | |
tree | 49ec28098059ba1fdd4ac829286da6bc4a0cbda6 /libavfilter/asink_anullsink.c | |
parent | 0fbe18b63eab17562bea4b98df8307ba3a90686b (diff) | |
parent | ec89f35e3e5eb9ec5221266e801efeee7ecab4df (diff) | |
download | ffmpeg-0842df2619a005ae8b02a2759a955e2e1248cd55.tar.gz |
Merge commit 'ec89f35e3e5eb9ec5221266e801efeee7ecab4df'
* commit 'ec89f35e3e5eb9ec5221266e801efeee7ecab4df':
x265: Map color parameters
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/asink_anullsink.c')
0 files changed, 0 insertions, 0 deletions