aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/Makefile
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-04-15 11:57:00 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-04-15 11:57:38 +0200
commit0842df2619a005ae8b02a2759a955e2e1248cd55 (patch)
tree49ec28098059ba1fdd4ac829286da6bc4a0cbda6 /libavformat/Makefile
parent0fbe18b63eab17562bea4b98df8307ba3a90686b (diff)
parentec89f35e3e5eb9ec5221266e801efeee7ecab4df (diff)
downloadffmpeg-0842df2619a005ae8b02a2759a955e2e1248cd55.tar.gz
Merge commit 'ec89f35e3e5eb9ec5221266e801efeee7ecab4df'
* commit 'ec89f35e3e5eb9ec5221266e801efeee7ecab4df': x265: Map color parameters Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/Makefile')
0 files changed, 0 insertions, 0 deletions