diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-08-30 12:22:03 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-08-30 12:22:03 +0400 |
| commit | 43ab8e86247b7889d16d915b4f370ceb618aaad4 (patch) | |
| tree | 64b1fec1adcc399eb1de5cd86ebafd753a921d8d /source/blender/imbuf/intern/thumbs.c | |
| parent | 5b5e600db6f529ad7e1af9d4bb3a193be2265342 (diff) | |
| parent | d049a722fea3d150fbfad06ffdbbb5c150717134 (diff) | |
* Merge trunk up to r39790.soc-2011-pepper
* Subversion bump (also for init_userdef_do_versions).
* Minor fix for compilation without ffmpeg.
Diffstat (limited to 'source/blender/imbuf/intern/thumbs.c')
| -rw-r--r-- | source/blender/imbuf/intern/thumbs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/imbuf/intern/thumbs.c b/source/blender/imbuf/intern/thumbs.c index 1d91f34f4fa..2ab7e55d1f8 100644 --- a/source/blender/imbuf/intern/thumbs.c +++ b/source/blender/imbuf/intern/thumbs.c @@ -317,9 +317,9 @@ ImBuf* IMB_thumb_create(const char* path, ThumbSize size, ThumbSource source, Im } } else if (THB_SOURCE_MOVIE == source) { struct anim * anim = NULL; - anim = IMB_open_anim(path, IB_rect | IB_metadata); + anim = IMB_open_anim(path, IB_rect | IB_metadata, 0); if (anim != NULL) { - img = IMB_anim_absolute(anim, 0); + img = IMB_anim_absolute(anim, 0, IMB_TC_NONE, IMB_PROXY_NONE); if (img == NULL) { printf("not an anim; %s\n", path); } else { |