diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-01-18 02:58:54 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-01-18 03:01:17 +0300 |
| commit | 27dff3fbc1e74aa6613d68a0d9f9b0096fc86f6e (patch) | |
| tree | 91c4fb3bbe944a4f9e0e6d72a25d12310872f849 /source/blender/avi/intern/avi_rgb.h | |
| parent | 8400b4b566350bd9d726a07627e74f5a995280da (diff) | |
| parent | e6df02861e17f75d4dd243776f35208681b78465 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/avi/intern/avi_rgb.h')
| -rw-r--r-- | source/blender/avi/intern/avi_rgb.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/avi/intern/avi_rgb.h b/source/blender/avi/intern/avi_rgb.h index 773166e9fab..67bb4172769 100644 --- a/source/blender/avi/intern/avi_rgb.h +++ b/source/blender/avi/intern/avi_rgb.h @@ -32,7 +32,7 @@ #ifndef __AVI_RGB_H__ #define __AVI_RGB_H__ -void *avi_converter_from_avi_rgb(AviMovie *movie, int stream, unsigned char *buffer, int *size); -void *avi_converter_to_avi_rgb(AviMovie *movie, int stream, unsigned char *buffer, int *size); +void *avi_converter_from_avi_rgb(AviMovie *movie, int stream, unsigned char *buffer, size_t *size); +void *avi_converter_to_avi_rgb(AviMovie *movie, int stream, unsigned char *buffer, size_t *size); #endif /* __AVI_RGB_H__ */ |