diff options
| author | Peter Schlaile <peter@schlaile.de> | 2006-02-05 22:23:34 +0300 |
|---|---|---|
| committer | Peter Schlaile <peter@schlaile.de> | 2006-02-05 22:23:34 +0300 |
| commit | 334b05741f0ed51f192c17328b62c7540970d1bf (patch) | |
| tree | d6c80eef057a39f567f5aff3c91fdc67a8e5abda /source/blender/imbuf/intern/IMB_anim.h | |
| parent | 38c4a3a209aa920d2d851c4250425bbfd66b508b (diff) | |
* Add memcache limitor-support to imbufs
* Add ffmpeg-read support in anim.c and util.c
* Makes ImBufs refcountable. You can now increase an internal refcounter
in ImBufs (using IMB_refImBuf) which is decreased by freeImBuf.
This makes it possible to simply pass ImBuf pointers around in the
sequencer saving a few memcopies.
Diffstat (limited to 'source/blender/imbuf/intern/IMB_anim.h')
| -rw-r--r-- | source/blender/imbuf/intern/IMB_anim.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/source/blender/imbuf/intern/IMB_anim.h b/source/blender/imbuf/intern/IMB_anim.h index 77958f82e42..5d597aa5463 100644 --- a/source/blender/imbuf/intern/IMB_anim.h +++ b/source/blender/imbuf/intern/IMB_anim.h @@ -78,6 +78,11 @@ #endif /* _WIN32 || __APPLE__ */ #endif /* WITH_QUICKTIME */ +#ifdef WITH_FFMPEG +#include <ffmpeg/avformat.h> +#include <ffmpeg/avcodec.h> +#endif + #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" @@ -112,6 +117,7 @@ #define ANIM_MDEC (1 << 5) #define ANIM_AVI (1 << 6) #define ANIM_QTIME (1 << 7) +#define ANIM_FFMPEG (1 << 8) #define ANIM5_MMAP 0 #define ANIM5_MALLOC 1 @@ -168,6 +174,16 @@ struct anim { /* quicktime */ struct _QuicktimeMovie *qtime; #endif /* WITH_QUICKTIME */ + +#ifdef WITH_FFMPEG + AVFormatContext *pFormatCtx; + AVCodecContext *pCodecCtx; + AVCodec *pCodec; + AVFrame *pFrameRGB; + AVFrame *pFrame; + int videoStream; +#endif + }; #endif |