diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-02-18 00:56:25 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-18 00:56:25 +0400 |
commit | 48006292d8b3c6c8dd4bfe87bdbe271db93cffff (patch) | |
tree | ca98c07367717703c5a8801063cc42e0aff5b855 /source/blender/avi/AVI_avi.h | |
parent | 4c66e696fbcaefe40f0394fea8fc4a55bb7d6994 (diff) | |
parent | 61596d5bb365a96b4b19adf0ef72ec1ea47212aa (diff) |
svn merge ^/trunk/blender -r44189:44204
Diffstat (limited to 'source/blender/avi/AVI_avi.h')
-rw-r--r-- | source/blender/avi/AVI_avi.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/avi/AVI_avi.h b/source/blender/avi/AVI_avi.h index ea073f79a7e..00c6863f75c 100644 --- a/source/blender/avi/AVI_avi.h +++ b/source/blender/avi/AVI_avi.h @@ -50,8 +50,8 @@ * */ -#ifndef __AVI_H__ -#define __AVI_H__ +#ifndef __AVI_AVI_H__ +#define __AVI_AVI_H__ #include "MEM_sys_types.h" #include <stdio.h> /* for FILE */ @@ -305,5 +305,5 @@ AviError AVI_write_frame (AviMovie *movie, int frame_num, ...); AviError AVI_print_error (AviError error); void AVI_set_debug (int mode); -#endif /* __AVI_H__ */ +#endif /* __AVI_AVI_H__ */ |