diff options
| author | Andrew Wiggin <ender79bl@gmail.com> | 2011-09-25 16:33:51 +0400 |
|---|---|---|
| committer | Andrew Wiggin <ender79bl@gmail.com> | 2011-09-25 16:33:51 +0400 |
| commit | 7c46f1c4b77873c27485bc278e04195611237602 (patch) | |
| tree | d1b92fda781d736bc8f3ebb0902876651bac6ff0 /source/blender/avi | |
| parent | 274b9c8fb88ff6499ac3b13a081c1e60965e459e (diff) | |
Fix some MSVC 2010 warnings (including one apparent bug in intern/elbeem/intern/solver_relax.h)
Diffstat (limited to 'source/blender/avi')
| -rw-r--r-- | source/blender/avi/intern/options.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/avi/intern/options.c b/source/blender/avi/intern/options.c index 96c62843436..8993c1ef96a 100644 --- a/source/blender/avi/intern/options.c +++ b/source/blender/avi/intern/options.c @@ -46,6 +46,7 @@ AviError AVI_set_compress_option (AviMovie *movie, int option_type, int stream, AviOption option, void *opt_data) { int i; + int useconds; (void)stream; /* unused */ @@ -100,8 +101,9 @@ AviError AVI_set_compress_option (AviMovie *movie, int option_type, int stream, break; case AVI_OPTION_FRAMERATE: - if (1000000/(*((double *) opt_data))) - movie->header->MicroSecPerFrame = 1000000/(*((double *) opt_data)); + useconds = (int)(1000000/(*((double *) opt_data))); + if (useconds) + movie->header->MicroSecPerFrame = useconds; for (i=0; i < movie->header->Streams; i++) { if (avi_get_format_type(movie->streams[i].format) == FCC("vids")) { |