summaryrefslogtreecommitdiff
path: root/TO_PORT
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-05-25 00:36:01 +0100
committerCarl Hetherington <cth@carlh.net>2015-05-25 00:36:01 +0100
commit8041bb9729662176eeb8d78ce4dac9dfb6896557 (patch)
tree836ad1f31abbc18488c9a8d69ba19a79c8c4dbce /TO_PORT
parentc8427a8043e430f71b83edcc22110e457f2b3c3c (diff)
c7f2d098e2c1201c84552a1972453e7b75a64c5d from master; Removed unused parameter from VideoContent::set_default_colour_conversion.
Diffstat (limited to 'TO_PORT')
-rw-r--r--TO_PORT4
1 files changed, 2 insertions, 2 deletions
diff --git a/TO_PORT b/TO_PORT
index 8ec40ff3a..d63518670 100644
--- a/TO_PORT
+++ b/TO_PORT
@@ -1,5 +1,3 @@
-21cb435ed5eb250a7f94887ddd75f6b367ea231f
-c7ec9dee8aa03ca86564d13f239dce0e498dc4bd
823dc6064795fd128bcb2f0229202d507e289324
994df155c9d1f6256cdcf51c355a74ebad24288b
ccb883a479cb341c686fc4237763f483d15e1ec5
@@ -14,4 +12,6 @@ c13575f0483d6e92956fa7fb2e424572702236dc
b41b6528fbe0d270415a8500a612da19469e49e4
c040b70eb777630ef0fdbb80cd419f6b3da4b46e
ea2becf3a859bc38c783d15f165d71f2ccb8c1d6
+Remove configurable colour conversion presets
+21cb435ed5eb250a7f94887ddd75f6b367ea231f
Multi-stream audio stuff.