diff options
| author | Julian Eisel <julian@blender.org> | 2020-08-07 14:04:31 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-08-07 14:04:31 +0300 |
| commit | 0d2d4a6d4a75ac38c41f872c88255eab70e88ab7 (patch) | |
| tree | b7a7518af86dddba48e05a98b3c2be55e8804721 /source/blender/io/avi/intern/avi_mjpeg.h | |
| parent | 9b416c66fb714bdfd15a481489dbf650d0f389ea (diff) | |
| parent | cfc6f9eb18e701f5be601b95c45004e8cf7fbc81 (diff) | |
Merge branch 'master' into temp-ui-button-type-refactortemp-ui-button-type-refactor
Diffstat (limited to 'source/blender/io/avi/intern/avi_mjpeg.h')
| -rw-r--r-- | source/blender/io/avi/intern/avi_mjpeg.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/io/avi/intern/avi_mjpeg.h b/source/blender/io/avi/intern/avi_mjpeg.h index 30e46bf1d0c..3ee1b611f70 100644 --- a/source/blender/io/avi/intern/avi_mjpeg.h +++ b/source/blender/io/avi/intern/avi_mjpeg.h @@ -21,10 +21,10 @@ * \ingroup avi */ -#ifndef __AVI_MJPEG_H__ -#define __AVI_MJPEG_H__ +#pragma once -void *avi_converter_from_mjpeg(AviMovie *movie, int stream, unsigned char *buffer, size_t *size); +void *avi_converter_from_mjpeg(AviMovie *movie, + int stream, + unsigned char *buffer, + const size_t *size); void *avi_converter_to_mjpeg(AviMovie *movie, int stream, unsigned char *buffer, size_t *size); - -#endif /* __AVI_MJPEG_H__ */ |