X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=flat_input.cpp;h=29165db773793781931a70807b1598bfc5b65daf;hp=8f24d86f9347b408b8edb2a9f24c677155b35591;hb=f34b1c36acd27944f00885edfc55363432bfec8e;hpb=0ed2c7fe3876a49d1565e3425e5a491206ffe32d

diff --git a/flat_input.cpp b/flat_input.cpp
index 8f24d86..29165db 100644
--- a/flat_input.cpp
+++ b/flat_input.cpp
@@ -22,7 +22,7 @@ FlatInput::FlatInput(ImageFormat image_format, MovitPixelFormat pixel_format_in,
 	  height(height),
 	  pitch(width),
 	  owns_texture(false),
-	  pixel_data(NULL),
+	  pixel_data(nullptr),
 	  fixup_swap_rb(false),
 	  fixup_red_to_grayscale(false)
 {
@@ -66,7 +66,7 @@ void FlatInput::set_gl_state(GLuint glsl_program_num, const string& prefix, unsi
 	glActiveTexture(GL_TEXTURE0 + *sampler_num);
 	check_error();
 
-	if (texture_num == 0 && (pbo != 0 || pixel_data != NULL)) {
+	if (texture_num == 0 && (pbo != 0 || pixel_data != nullptr)) {
 		// Translate the input format to OpenGL's enums.
 		GLint internal_format;
 		GLenum format;