diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-05-09 16:42:19 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-05-09 16:42:19 +0400 |
| commit | 1e30f000308debebf7cd5bbf6a9b37b8a94182de (patch) | |
| tree | d6edeb35644fd1048d4b71d1f55ef1ab019bacef /source/blender/imbuf/intern/IMB_anim.h | |
| parent | 8a20433f0fef5ab2d881d010cd5bd19fe484e555 (diff) | |
| parent | 80f6671dfe64ece1e692c8032e1d1169621bceff (diff) | |
Merged changes in the trunk up to revision 28685.
Diffstat (limited to 'source/blender/imbuf/intern/IMB_anim.h')
| -rw-r--r-- | source/blender/imbuf/intern/IMB_anim.h | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/source/blender/imbuf/intern/IMB_anim.h b/source/blender/imbuf/intern/IMB_anim.h index 39b8e48fb7f..c9eac2c1399 100644 --- a/source/blender/imbuf/intern/IMB_anim.h +++ b/source/blender/imbuf/intern/IMB_anim.h @@ -65,7 +65,6 @@ BLI_countlist BLI_stringdec */ #include "imbuf.h" -#include "imbuf_patch.h" #include "AVI_avi.h" @@ -93,7 +92,6 @@ #include "IMB_imbuf.h" #include "IMB_allocimbuf.h" -#include "IMB_bitplanes.h" @@ -117,7 +115,7 @@ #define ANIM_NONE (0) #define ANIM_SEQUENCE (1 << 0) #define ANIM_DIR (1 << 1) -#define ANIM_ANIM5 (1 << 2) +#define ANIM_DEPRECATED (1 << 2) #define ANIM_TGA (1 << 3) #define ANIM_MOVIE (1 << 4) #define ANIM_MDEC (1 << 5) @@ -126,13 +124,10 @@ #define ANIM_FFMPEG (1 << 8) #define ANIM_REDCODE (1 << 9) -#define ANIM5_MMAP 0 -#define ANIM5_MALLOC 1 -#define ANIM5_SNGBUF 2 -#define ANIM5_XOR 4 - #define MAXNUMSTREAMS 50 +struct _AviMovie; + struct anim { int ib_flags; int curtype; @@ -145,14 +140,6 @@ struct anim { /* voor sequence */ char first[256]; - /* anim5 */ - struct ListBase anim5base; - void * anim5mmap; - int anim5len; - struct Anim5Delta *anim5curdlta; - void (*anim5decode)(struct ImBuf *, unsigned char *); - int anim5flags; - /* movie */ void *movie; void *track; |