diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/imbuf/intern/IMB_anim.h | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/imbuf/intern/IMB_anim.h')
-rw-r--r-- | source/blender/imbuf/intern/IMB_anim.h | 127 |
1 files changed, 63 insertions, 64 deletions
diff --git a/source/blender/imbuf/intern/IMB_anim.h b/source/blender/imbuf/intern/IMB_anim.h index a0a8a938870..065c7e64d07 100644 --- a/source/blender/imbuf/intern/IMB_anim.h +++ b/source/blender/imbuf/intern/IMB_anim.h @@ -21,7 +21,6 @@ * \ingroup imbuf */ - #ifndef __IMB_ANIM_H__ #define __IMB_ANIM_H__ @@ -34,9 +33,9 @@ # include <commdlg.h> # include <vfw.h> -# undef AVIIF_KEYFRAME // redefined in AVI_avi.h -# undef AVIIF_LIST // redefined in AVI_avi.h -#endif /* _WIN32 */ +# undef AVIIF_KEYFRAME // redefined in AVI_avi.h +# undef AVIIF_LIST // redefined in AVI_avi.h +#endif /* _WIN32 */ #include <sys/types.h> #include <ctype.h> @@ -74,84 +73,84 @@ #endif /* anim.curtype, runtime only */ -#define ANIM_NONE 0 -#define ANIM_SEQUENCE (1 << 0) -#define ANIM_MOVIE (1 << 4) -#define ANIM_AVI (1 << 6) -#define ANIM_FFMPEG (1 << 8) +#define ANIM_NONE 0 +#define ANIM_SEQUENCE (1 << 0) +#define ANIM_MOVIE (1 << 4) +#define ANIM_AVI (1 << 6) +#define ANIM_FFMPEG (1 << 8) -#define MAXNUMSTREAMS 50 +#define MAXNUMSTREAMS 50 struct IDProperty; struct _AviMovie; struct anim_index; struct anim { - int ib_flags; - int curtype; - int curposition; /* index 0 = 1e, 1 = 2e, enz. */ - int duration; - int frs_sec; - double frs_sec_base; - int x, y; - - /* for number */ - char name[1024]; - /* for sequence */ - char first[1024]; - - /* movie */ - void *movie; - void *track; - void *params; - int orientation; - size_t framesize; - int interlacing; - int preseek; - int streamindex; - - /* avi */ - struct _AviMovie *avi; + int ib_flags; + int curtype; + int curposition; /* index 0 = 1e, 1 = 2e, enz. */ + int duration; + int frs_sec; + double frs_sec_base; + int x, y; + + /* for number */ + char name[1024]; + /* for sequence */ + char first[1024]; + + /* movie */ + void *movie; + void *track; + void *params; + int orientation; + size_t framesize; + int interlacing; + int preseek; + int streamindex; + + /* avi */ + struct _AviMovie *avi; #if defined(_WIN32) - /* windows avi */ - int avistreams; - int firstvideo; - int pfileopen; - PAVIFILE pfile; - PAVISTREAM pavi[MAXNUMSTREAMS]; // the current streams - PGETFRAME pgf; + /* windows avi */ + int avistreams; + int firstvideo; + int pfileopen; + PAVIFILE pfile; + PAVISTREAM pavi[MAXNUMSTREAMS]; // the current streams + PGETFRAME pgf; #endif #ifdef WITH_FFMPEG - AVFormatContext *pFormatCtx; - AVCodecContext *pCodecCtx; - AVCodec *pCodec; - AVFrame *pFrame; - int pFrameComplete; - AVFrame *pFrameRGB; - AVFrame *pFrameDeinterlaced; - struct SwsContext *img_convert_ctx; - int videoStream; - - struct ImBuf *last_frame; - int64_t last_pts; - int64_t next_pts; - AVPacket next_packet; + AVFormatContext *pFormatCtx; + AVCodecContext *pCodecCtx; + AVCodec *pCodec; + AVFrame *pFrame; + int pFrameComplete; + AVFrame *pFrameRGB; + AVFrame *pFrameDeinterlaced; + struct SwsContext *img_convert_ctx; + int videoStream; + + struct ImBuf *last_frame; + int64_t last_pts; + int64_t next_pts; + AVPacket next_packet; #endif - char index_dir[768]; + char index_dir[768]; - int proxies_tried; - int indices_tried; + int proxies_tried; + int indices_tried; - struct anim *proxy_anim[IMB_PROXY_MAX_SLOT]; - struct anim_index *curr_idx[IMB_TC_MAX_SLOT]; + struct anim *proxy_anim[IMB_PROXY_MAX_SLOT]; + struct anim_index *curr_idx[IMB_TC_MAX_SLOT]; - char colorspace[64]; - char suffix[64]; /* MAX_NAME - multiview */ + char colorspace[64]; + char suffix[64]; /* MAX_NAME - multiview */ - struct IDProperty *metadata; + struct IDProperty *metadata; }; #endif |