diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-20 05:14:33 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-20 05:14:33 +0400 |
| commit | 3c8d86e117b54914524cbc49a8678ecaad8671cf (patch) | |
| tree | 8101c8b12f888ded58d7e489e7855e754f0cf065 /source/blender/imbuf | |
| parent | 331dd678c75ba1ef4e714c989c8f1bfae35508c2 (diff) | |
| parent | acf30220c9d63e0f060ee69115fe82016de025d4 (diff) | |
svn merge ^/trunk/blender -r41961:41998
Diffstat (limited to 'source/blender/imbuf')
| -rw-r--r-- | source/blender/imbuf/intern/anim_movie.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c index 3c32332cd8d..db27c1cee63 100644 --- a/source/blender/imbuf/intern/anim_movie.c +++ b/source/blender/imbuf/intern/anim_movie.c @@ -895,7 +895,7 @@ static int ffmpeg_seek_by_byte(AVFormatContext *pFormatCtx) static ImBuf * ffmpeg_fetchibuf(struct anim * anim, int position, IMB_Timecode_Type tc) { - unsigned long long pts_to_search = 0; + int64_t pts_to_search = 0; double frame_rate; double pts_time_base; long long st_time; |