X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=ycbcr_input.cpp;h=b0ca69291198fc69b7badc37b35b30d92741930c;hb=ddca8a12a62ffe6b13d86cbd5b3aac75231e8802;hp=4c824c6d092ddc94617a2ecf18e96be4c3a51202;hpb=84412c6d89fbe3563bab0b151274eb56c2ddd35c;p=movit

diff --git a/ycbcr_input.cpp b/ycbcr_input.cpp
index 4c824c6..b0ca692 100644
--- a/ycbcr_input.cpp
+++ b/ycbcr_input.cpp
@@ -30,15 +30,8 @@ YCbCrInput::YCbCrInput(const ImageFormat &image_format,
 	pbos[0] = pbos[1] = pbos[2] = 0;
 	texture_num[0] = texture_num[1] = texture_num[2] = 0;
 
-	assert(width % ycbcr_format.chroma_subsampling_x == 0);
-	pitch[0] = widths[0] = width;
-	pitch[1] = widths[1] = width / ycbcr_format.chroma_subsampling_x;
-	pitch[2] = widths[2] = width / ycbcr_format.chroma_subsampling_x;
-
-	assert(height % ycbcr_format.chroma_subsampling_y == 0);
-	heights[0] = height;
-	heights[1] = height / ycbcr_format.chroma_subsampling_y;
-	heights[2] = height / ycbcr_format.chroma_subsampling_y;
+	set_width(width);
+	set_height(height);
 
 	pixel_data[0] = pixel_data[1] = pixel_data[2] = NULL;
 	owns_texture[0] = owns_texture[1] = owns_texture[2] = false;
@@ -69,7 +62,7 @@ void YCbCrInput::set_gl_state(GLuint glsl_program_num, const string& prefix, uns
 		glActiveTexture(GL_TEXTURE0 + *sampler_num + channel);
 		check_error();
 
-		if (texture_num[channel] == 0) {
+		if (texture_num[channel] == 0 && (pbos[channel] != 0 || pixel_data[channel] != NULL)) {
 			GLenum format, internal_format;
 			if (channel == 1 && ycbcr_input_splitting == YCBCR_INPUT_SPLIT_Y_AND_CBCR) {
 				format = GL_RG;