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>2012-04-29 21:11:40 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-04-29 21:11:40 +0400
commit343edf2722a9e114b98944c1147676e630e699b7 (patch)
tree7b969239ccab922b6390e040f85e96afa956932a /source/blender/avi
parentb6c1850fd35c040c9d489eb42c2190f38564d381 (diff)
style cleanup: function calls & whitespace.
Diffstat (limited to 'source/blender/avi')
-rw-r--r--source/blender/avi/AVI_avi.h36
-rw-r--r--source/blender/avi/intern/avi.c28
-rw-r--r--source/blender/avi/intern/codecs.c8
-rw-r--r--source/blender/avi/intern/endian.c2
-rw-r--r--source/blender/avi/intern/options.c2
5 files changed, 38 insertions, 38 deletions
diff --git a/source/blender/avi/AVI_avi.h b/source/blender/avi/AVI_avi.h
index a579bf7dfec..5f4bdf88879 100644
--- a/source/blender/avi/AVI_avi.h
+++ b/source/blender/avi/AVI_avi.h
@@ -235,28 +235,28 @@ typedef enum {
/**
* Test whether this is an avi-format.
*/
-int AVI_is_avi (const char *name);
+int AVI_is_avi(const char *name);
/**
* Open a compressed file, decompress it into memory.
*/
-AviError AVI_open_compress (char *name, AviMovie *movie, int streams, ...);
+AviError AVI_open_compress(char *name, AviMovie *movie, int streams, ...);
/**
* Finalize a compressed output stream.
*/
-AviError AVI_close_compress (AviMovie *movie);
+AviError AVI_close_compress(AviMovie *movie);
/**
* Choose a compression option for \<movie\>. Possible options are
* AVI_OPTION_TYPE_MAIN, AVI_OPTION_TYPE_STRH, AVI_OPTION_TYPE_STRF
*/
-AviError AVI_set_compress_option (AviMovie *movie,
- int option_type,
- int stream,
- AviOption option,
- void *opt_data);
+AviError AVI_set_compress_option(AviMovie *movie,
+ int option_type,
+ int stream,
+ AviOption option,
+ void *opt_data);
/* Hmmm... there should be some explanantion about what these mean */
/**
* Compression option, for use in avi_set_compress_option
@@ -275,35 +275,35 @@ AviError AVI_set_compress_option (AviMovie *movie,
* Direct the streams \<avist_type\> to \<movie\>. Redirect \<stream_num\>
* streams.
*/
-int AVI_get_stream (AviMovie *movie, int avist_type, int stream_num);
+int AVI_get_stream(AviMovie *movie, int avist_type, int stream_num);
/**
* Open a movie stream from file.
*/
-AviError AVI_open_movie (const char *name, AviMovie *movie);
+AviError AVI_open_movie(const char *name, AviMovie *movie);
/**
* Read a frame from a movie stream.
*/
-void *AVI_read_frame (AviMovie *movie,
- AviFormat format,
- int frame,
- int stream);
+void *AVI_read_frame(AviMovie *movie,
+ AviFormat format,
+ int frame,
+ int stream);
/**
* Close an open movie stream.
*/
-AviError AVI_close (AviMovie *movie);
+AviError AVI_close(AviMovie *movie);
/**
* Write frames to a movie stream.
*/
-AviError AVI_write_frame (AviMovie *movie, int frame_num, ...);
+AviError AVI_write_frame(AviMovie *movie, int frame_num, ...);
/**
* Unused but still external
*/
-AviError AVI_print_error (AviError error);
-void AVI_set_debug (int mode);
+AviError AVI_print_error(AviError error);
+void AVI_set_debug(int mode);
#endif /* __AVI_AVI_H__ */
diff --git a/source/blender/avi/intern/avi.c b/source/blender/avi/intern/avi.c
index ea83afb16fb..3a64a8aa8ac 100644
--- a/source/blender/avi/intern/avi.c
+++ b/source/blender/avi/intern/avi.c
@@ -58,8 +58,8 @@ static char DEBUG_FCC[4];
#define DEBUG_PRINT(x) if (AVI_DEBUG) { printf("AVI DEBUG: " x); } (void)0
/* local functions */
-char *fcc_to_char (unsigned int fcc);
-char *tcc_to_char (unsigned int tcc);
+char *fcc_to_char(unsigned int fcc);
+char *tcc_to_char(unsigned int tcc);
@@ -89,7 +89,7 @@ unsigned int GET_TCC (FILE *fp)
return FCC (tmp);
}
-char *fcc_to_char (unsigned int fcc)
+char *fcc_to_char(unsigned int fcc)
{
DEBUG_FCC[0]= (fcc)&127;
DEBUG_FCC[1]= (fcc>>8)&127;
@@ -99,7 +99,7 @@ char *fcc_to_char (unsigned int fcc)
return DEBUG_FCC;
}
-char *tcc_to_char (unsigned int tcc)
+char *tcc_to_char(unsigned int tcc)
{
DEBUG_FCC[0]= (tcc)&127;
DEBUG_FCC[1]= (tcc>>8)&127;
@@ -109,7 +109,7 @@ char *tcc_to_char (unsigned int tcc)
return DEBUG_FCC;
}
-int AVI_get_stream (AviMovie *movie, int avist_type, int stream_num)
+int AVI_get_stream(AviMovie *movie, int avist_type, int stream_num)
{
int cur_stream;
@@ -157,7 +157,7 @@ static int fcc_is_data (int fcc)
return 1;
}
-AviError AVI_print_error (AviError in_error)
+AviError AVI_print_error(AviError in_error)
{
int error;
@@ -200,12 +200,12 @@ AviError AVI_print_error (AviError in_error)
return in_error;
}
#if 0
-void AVI_set_debug (int mode)
+void AVI_set_debug(int mode)
{
AVI_DEBUG= mode;
}
-int AVI_is_avi (char *name)
+int AVI_is_avi(char *name)
{
FILE *fp;
int ret;
@@ -228,7 +228,7 @@ int AVI_is_avi (char *name)
}
#endif
-int AVI_is_avi (const char *name)
+int AVI_is_avi(const char *name)
{
int temp, fcca, j;
AviMovie movie= {NULL};
@@ -425,7 +425,7 @@ int AVI_is_avi (const char *name)
}
-AviError AVI_open_movie (const char *name, AviMovie *movie)
+AviError AVI_open_movie(const char *name, AviMovie *movie)
{
int temp, fcca, size, j;
@@ -714,7 +714,7 @@ void *AVI_read_frame (AviMovie *movie, AviFormat format, int frame, int stream)
return buffer;
}
-AviError AVI_close (AviMovie *movie)
+AviError AVI_close(AviMovie *movie)
{
int i;
@@ -737,7 +737,7 @@ AviError AVI_close (AviMovie *movie)
return AVI_ERROR_NONE;
}
-AviError AVI_open_compress (char *name, AviMovie *movie, int streams, ...)
+AviError AVI_open_compress(char *name, AviMovie *movie, int streams, ...)
{
va_list ap;
AviList list;
@@ -933,7 +933,7 @@ AviError AVI_open_compress (char *name, AviMovie *movie, int streams, ...)
return AVI_ERROR_NONE;
}
-AviError AVI_write_frame (AviMovie *movie, int frame_num, ...)
+AviError AVI_write_frame(AviMovie *movie, int frame_num, ...)
{
AviList list;
AviChunk chunk;
@@ -1041,7 +1041,7 @@ AviError AVI_write_frame (AviMovie *movie, int frame_num, ...)
return AVI_ERROR_NONE;
}
-AviError AVI_close_compress (AviMovie *movie)
+AviError AVI_close_compress(AviMovie *movie)
{
int temp, movi_size, i;
diff --git a/source/blender/avi/intern/codecs.c b/source/blender/avi/intern/codecs.c
index 222900b6637..87db5915dc8 100644
--- a/source/blender/avi/intern/codecs.c
+++ b/source/blender/avi/intern/codecs.c
@@ -85,7 +85,7 @@ void *avi_format_convert (AviMovie *movie, int stream, void *buffer, AviFormat f
return buffer;
}
-int avi_get_data_id (AviFormat format, int stream)
+int avi_get_data_id(AviFormat format, int stream)
{
char fcc[5];
@@ -99,7 +99,7 @@ int avi_get_data_id (AviFormat format, int stream)
return FCC(fcc);
}
-int avi_get_format_type (AviFormat format)
+int avi_get_format_type(AviFormat format)
{
switch (format) {
case AVI_FORMAT_RGB24:
@@ -114,7 +114,7 @@ int avi_get_format_type (AviFormat format)
}
}
-int avi_get_format_fcc (AviFormat format)
+int avi_get_format_fcc(AviFormat format)
{
switch (format) {
case AVI_FORMAT_RGB24:
@@ -131,7 +131,7 @@ int avi_get_format_fcc (AviFormat format)
}
}
-int avi_get_format_compression (AviFormat format)
+int avi_get_format_compression(AviFormat format)
{
switch (format) {
case AVI_FORMAT_RGB24:
diff --git a/source/blender/avi/intern/endian.c b/source/blender/avi/intern/endian.c
index eb9e586cfb0..41b8202af03 100644
--- a/source/blender/avi/intern/endian.c
+++ b/source/blender/avi/intern/endian.c
@@ -169,7 +169,7 @@ static void Iindexe (AviIndexEntry *indexe)
}
#endif /* __BIG_ENDIAN__ */
-void awrite (AviMovie *movie, void *datain, int block, int size, FILE *fp, int type)
+void awrite(AviMovie *movie, void *datain, int block, int size, FILE *fp, int type)
{
#ifdef __BIG_ENDIAN__
void *data;
diff --git a/source/blender/avi/intern/options.c b/source/blender/avi/intern/options.c
index a2fd756ddaa..fb1ed24926e 100644
--- a/source/blender/avi/intern/options.c
+++ b/source/blender/avi/intern/options.c
@@ -44,7 +44,7 @@
/* avi_set_compress_options gets its own file... now don't WE feel important? */
-AviError AVI_set_compress_option (AviMovie *movie, int option_type, int stream, AviOption option, void *opt_data)
+AviError AVI_set_compress_option(AviMovie *movie, int option_type, int stream, AviOption option, void *opt_data)
{
int i;
int useconds;