Merge branch 'master' into blender2.8

1 files changed, 4 insertions, 4 deletions

diff --git a/source/blender/avi/intern/avi_rgb.c b/source/blender/avi/intern/avi_rgb.c
index f0baf7c6c14..6997a0d8be4 100644
--- a/source/blender/avi/intern/avi_rgb.c
+++ b/source/blender/avi/intern/avi_rgb.c
@@ -49,7 +49,7 @@ void *avi_converter_from_avi_rgb(AviMovie *movie, int stream, unsigned char *buf
 	unsigned char *buf;
 	AviBitmapInfoHeader *bi;
 	short bits = 32;
-	
+
 	(void)size; /* unused */
 
 	bi = (AviBitmapInfoHeader *) movie->streams[stream].sf;
@@ -70,7 +70,7 @@ void *avi_converter_from_avi_rgb(AviMovie *movie, int stream, unsigned char *buf
 
 			while (y--) {
 				pxl = (unsigned short *) (buffer + y * movie->header->Width * 2);
-				
+
 #ifdef __BIG_ENDIAN__
 				pxla = (unsigned char *)pxl;
 #endif
@@ -94,12 +94,12 @@ void *avi_converter_from_avi_rgb(AviMovie *movie, int stream, unsigned char *buf
 		}
 
 		MEM_freeN(buffer);
-		
+
 		return buf;
 	}
 	else {
 		buf = imb_alloc_pixels(movie->header->Height, movie->header->Width, 3, sizeof(unsigned char),  "fromavirgbbuf");
-	
+
 		if (buf) {
 			size_t rowstride = movie->header->Width * 3;
 			if ((bits != 16) && (movie->header->Width % 2)) rowstride++;