Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-04-17 07:17:24 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 07:21:24 +0300
commite12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch)
tree8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/blenkernel/BKE_writeffmpeg.h
parentb3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (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/blenkernel/BKE_writeffmpeg.h')
-rw-r--r--source/blender/blenkernel/BKE_writeffmpeg.h73
1 files changed, 45 insertions, 28 deletions
diff --git a/source/blender/blenkernel/BKE_writeffmpeg.h b/source/blender/blenkernel/BKE_writeffmpeg.h
index 701f83e59a3..4d008f8d249 100644
--- a/source/blender/blenkernel/BKE_writeffmpeg.h
+++ b/source/blender/blenkernel/BKE_writeffmpeg.h
@@ -26,45 +26,62 @@
#ifdef WITH_FFMPEG
-#ifdef __cplusplus
+# ifdef __cplusplus
extern "C" {
-#endif
+# endif
enum {
- FFMPEG_MPEG1 = 0,
- FFMPEG_MPEG2 = 1,
- FFMPEG_MPEG4 = 2,
- FFMPEG_AVI = 3,
- FFMPEG_MOV = 4,
- FFMPEG_DV = 5,
- FFMPEG_H264 = 6,
- FFMPEG_XVID = 7,
- FFMPEG_FLV = 8,
- FFMPEG_MKV = 9,
- FFMPEG_OGG = 10,
- FFMPEG_INVALID = 11,
+ FFMPEG_MPEG1 = 0,
+ FFMPEG_MPEG2 = 1,
+ FFMPEG_MPEG4 = 2,
+ FFMPEG_AVI = 3,
+ FFMPEG_MOV = 4,
+ FFMPEG_DV = 5,
+ FFMPEG_H264 = 6,
+ FFMPEG_XVID = 7,
+ FFMPEG_FLV = 8,
+ FFMPEG_MKV = 9,
+ FFMPEG_OGG = 10,
+ FFMPEG_INVALID = 11,
};
enum {
- FFMPEG_PRESET_NONE = 0,
- FFMPEG_PRESET_DVD = 1,
- FFMPEG_PRESET_SVCD = 2,
- FFMPEG_PRESET_VCD = 3,
- FFMPEG_PRESET_DV = 4,
- FFMPEG_PRESET_H264 = 5,
- FFMPEG_PRESET_THEORA = 6,
- FFMPEG_PRESET_XVID = 7,
+ FFMPEG_PRESET_NONE = 0,
+ FFMPEG_PRESET_DVD = 1,
+ FFMPEG_PRESET_SVCD = 2,
+ FFMPEG_PRESET_VCD = 3,
+ FFMPEG_PRESET_DV = 4,
+ FFMPEG_PRESET_H264 = 5,
+ FFMPEG_PRESET_THEORA = 6,
+ FFMPEG_PRESET_XVID = 7,
};
struct RenderData;
struct ReportList;
struct Scene;
-int BKE_ffmpeg_start(void *context_v, struct Scene *scene, struct RenderData *rd, int rectx, int recty, struct ReportList *reports, bool preview, const char *suffix);
+int BKE_ffmpeg_start(void *context_v,
+ struct Scene *scene,
+ struct RenderData *rd,
+ int rectx,
+ int recty,
+ struct ReportList *reports,
+ bool preview,
+ const char *suffix);
void BKE_ffmpeg_end(void *context_v);
-int BKE_ffmpeg_append(void *context_v, struct RenderData *rd, int start_frame, int frame, int *pixels,
- int rectx, int recty, const char *suffix, struct ReportList *reports);
-void BKE_ffmpeg_filepath_get(char *string, struct RenderData *rd, bool preview, const char *suffix);
+int BKE_ffmpeg_append(void *context_v,
+ struct RenderData *rd,
+ int start_frame,
+ int frame,
+ int *pixels,
+ int rectx,
+ int recty,
+ const char *suffix,
+ struct ReportList *reports);
+void BKE_ffmpeg_filepath_get(char *string,
+ struct RenderData *rd,
+ bool preview,
+ const char *suffix);
void BKE_ffmpeg_preset_set(struct RenderData *rd, int preset);
void BKE_ffmpeg_image_type_verify(struct RenderData *rd, struct ImageFormatData *imf);
@@ -77,9 +94,9 @@ void BKE_ffmpeg_property_del(struct RenderData *rd, void *type, void *prop_);
void *BKE_ffmpeg_context_create(void);
void BKE_ffmpeg_context_free(void *context_v);
-#ifdef __cplusplus
+# ifdef __cplusplus
}
-#endif
+# endif
#endif