X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=effect_chain.cpp;h=efd4abc49a611c233164089858d586a0538d075b;hb=f44c81569a268efea44f1f6df03a000711b18ffc;hp=90fadb7251fb3bc18235a922f2c124f1ae202bf7;hpb=06b6e60952d58b700fa95be16496cc9c2a1af346;p=movit

diff --git a/effect_chain.cpp b/effect_chain.cpp
index 90fadb7..efd4abc 100644
--- a/effect_chain.cpp
+++ b/effect_chain.cpp
@@ -97,7 +97,8 @@ void EffectChain::add_output(const ImageFormat &format, OutputAlphaFormat alpha_
 }
 
 void EffectChain::add_ycbcr_output(const ImageFormat &format, OutputAlphaFormat alpha_format,
-                                   const YCbCrFormat &ycbcr_format, YCbCrOutputSplitting output_splitting)
+                                   const YCbCrFormat &ycbcr_format, YCbCrOutputSplitting output_splitting,
+                                   GLenum output_type)
 {
 	assert(!finalized);
 	assert(num_output_color_ycbcr < 2);
@@ -111,8 +112,10 @@ void EffectChain::add_ycbcr_output(const ImageFormat &format, OutputAlphaFormat
 		assert(output_ycbcr_format.num_levels == ycbcr_format.num_levels);
 		assert(output_ycbcr_format.chroma_subsampling_x == 1);
 		assert(output_ycbcr_format.chroma_subsampling_y == 1);
+		assert(output_ycbcr_type == output_type);
 	} else {
 		output_ycbcr_format = ycbcr_format;
+		output_ycbcr_type = output_type;
 	}
 	output_ycbcr_splitting[num_output_color_ycbcr++] = output_splitting;
 
@@ -1644,7 +1647,7 @@ void EffectChain::add_ycbcr_conversion_if_needed()
 		return;
 	}
 	Node *output = find_output_node();
-	ycbcr_conversion_effect_node = add_node(new YCbCrConversionEffect(output_ycbcr_format));
+	ycbcr_conversion_effect_node = add_node(new YCbCrConversionEffect(output_ycbcr_format, output_ycbcr_type));
 	connect_nodes(output, ycbcr_conversion_effect_node);
 }