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>2011-12-30 11:55:15 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-12-30 11:55:15 +0400
commit6d965f4493871c9bd4550939b8263d0c509b7c41 (patch)
treeeb5fecdc3fc376d056d9e4ea7366c3a8e0dea8b7 /source/blender/quicktime
parentca629d5ccc65da456babba6c5bdbfa0de737ac7b (diff)
style edits for function declarations
Diffstat (limited to 'source/blender/quicktime')
-rw-r--r--source/blender/quicktime/apple/qtkit_export.m30
-rw-r--r--source/blender/quicktime/apple/qtkit_import.m3
-rw-r--r--source/blender/quicktime/apple/quicktime_export.c24
-rw-r--r--source/blender/quicktime/apple/quicktime_import.c3
4 files changed, 40 insertions, 20 deletions
diff --git a/source/blender/quicktime/apple/qtkit_export.m b/source/blender/quicktime/apple/qtkit_export.m
index b1fa00d3509..365a06c7cd8 100644
--- a/source/blender/quicktime/apple/qtkit_export.m
+++ b/source/blender/quicktime/apple/qtkit_export.m
@@ -127,7 +127,8 @@ static QuicktimeCodecTypeDesc qtVideoCodecList[] = {
static int qtVideoCodecCount = 18;
-int quicktime_get_num_videocodecs() {
+int quicktime_get_num_videocodecs()
+{
return qtVideoCodecCount;
}
@@ -138,7 +139,8 @@ QuicktimeCodecTypeDesc* quicktime_get_videocodecType_desc(int indexValue) {
return NULL;
}
-int quicktime_rnatmpvalue_from_videocodectype(int codecType) {
+int quicktime_rnatmpvalue_from_videocodectype(int codecType)
+{
int i;
for (i=0;i<qtVideoCodecCount;i++) {
if (qtVideoCodecList[i].codecType == codecType)
@@ -148,7 +150,8 @@ int quicktime_rnatmpvalue_from_videocodectype(int codecType) {
return 0;
}
-int quicktime_videocodecType_from_rnatmpvalue(int rnatmpvalue) {
+int quicktime_videocodecType_from_rnatmpvalue(int rnatmpvalue)
+{
int i;
for (i=0;i<qtVideoCodecCount;i++) {
if (qtVideoCodecList[i].rnatmpvalue == rnatmpvalue)
@@ -168,7 +171,8 @@ static QuicktimeCodecTypeDesc qtAudioCodecList[] = {
static int qtAudioCodecCount = 4;
-int quicktime_get_num_audiocodecs() {
+int quicktime_get_num_audiocodecs()
+{
return qtAudioCodecCount;
}
@@ -179,7 +183,8 @@ QuicktimeCodecTypeDesc* quicktime_get_audiocodecType_desc(int indexValue) {
return NULL;
}
-int quicktime_rnatmpvalue_from_audiocodectype(int codecType) {
+int quicktime_rnatmpvalue_from_audiocodectype(int codecType)
+{
int i;
for (i=0;i<qtAudioCodecCount;i++) {
if (qtAudioCodecList[i].codecType == codecType)
@@ -189,7 +194,8 @@ int quicktime_rnatmpvalue_from_audiocodectype(int codecType) {
return 0;
}
-int quicktime_audiocodecType_from_rnatmpvalue(int rnatmpvalue) {
+int quicktime_audiocodecType_from_rnatmpvalue(int rnatmpvalue)
+{
int i;
for (i=0;i<qtAudioCodecCount;i++) {
if (qtAudioCodecList[i].rnatmpvalue == rnatmpvalue)
@@ -200,7 +206,8 @@ int quicktime_audiocodecType_from_rnatmpvalue(int rnatmpvalue) {
}
-static NSString *stringWithCodecType(int codecType) {
+static NSString *stringWithCodecType(int codecType)
+{
char str[5];
*((int*)str) = EndianU32_NtoB(codecType);
@@ -209,7 +216,8 @@ static NSString *stringWithCodecType(int codecType) {
return [NSString stringWithCString:str encoding:NSASCIIStringEncoding];
}
-void makeqtstring (RenderData *rd, char *string) {
+void makeqtstring (RenderData *rd, char *string)
+{
char txt[64];
strcpy(string, rd->pic);
@@ -223,7 +231,8 @@ void makeqtstring (RenderData *rd, char *string) {
}
}
-void filepath_qt(char *string, RenderData *rd) {
+void filepath_qt(char *string, RenderData *rd)
+{
if (string==NULL) return;
strcpy(string, rd->pic);
@@ -779,7 +788,8 @@ void end_qt(void)
}
-void free_qtcomponentdata(void) {
+void free_qtcomponentdata(void)
+{
}
void quicktime_verify_image_type(RenderData *rd, ImageFormatData *imf)
diff --git a/source/blender/quicktime/apple/qtkit_import.m b/source/blender/quicktime/apple/qtkit_import.m
index 4307529002c..4c2bcee0150 100644
--- a/source/blender/quicktime/apple/qtkit_import.m
+++ b/source/blender/quicktime/apple/qtkit_import.m
@@ -112,7 +112,8 @@ int anim_is_quicktime (const char *name)
}
-void free_anim_quicktime (struct anim *anim) {
+void free_anim_quicktime (struct anim *anim)
+{
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
if (anim == NULL) return;
diff --git a/source/blender/quicktime/apple/quicktime_export.c b/source/blender/quicktime/apple/quicktime_export.c
index 5dfce9d3e80..101fcc0a732 100644
--- a/source/blender/quicktime/apple/quicktime_export.c
+++ b/source/blender/quicktime/apple/quicktime_export.c
@@ -148,7 +148,8 @@ static QuicktimeCodecTypeDesc qtVideoCodecList[] = {
static int qtVideoCodecCount = 12;
-int quicktime_get_num_videocodecs() {
+int quicktime_get_num_videocodecs()
+{
return qtVideoCodecCount;
}
@@ -159,7 +160,8 @@ QuicktimeCodecTypeDesc* quicktime_get_videocodecType_desc(int indexValue) {
return NULL;
}
-int quicktime_rnatmpvalue_from_videocodectype(int codecType) {
+int quicktime_rnatmpvalue_from_videocodectype(int codecType)
+{
int i;
for (i=0;i<qtVideoCodecCount;i++) {
if (qtVideoCodecList[i].codecType == codecType)
@@ -169,7 +171,8 @@ int quicktime_rnatmpvalue_from_videocodectype(int codecType) {
return 0;
}
-int quicktime_videocodecType_from_rnatmpvalue(int rnatmpvalue) {
+int quicktime_videocodecType_from_rnatmpvalue(int rnatmpvalue)
+{
int i;
for (i=0;i<qtVideoCodecCount;i++) {
if (qtVideoCodecList[i].rnatmpvalue == rnatmpvalue)
@@ -496,7 +499,8 @@ static void QT_EndAddVideoSamplesToMedia (void)
}
-void filepath_qt(char *string, RenderData *rd) {
+void filepath_qt(char *string, RenderData *rd)
+{
char txt[64];
if (string==0) return;
@@ -513,7 +517,8 @@ void filepath_qt(char *string, RenderData *rd) {
}
-int start_qt(struct Scene *scene, struct RenderData *rd, int rectx, int recty, ReportList *reports) {
+int start_qt(struct Scene *scene, struct RenderData *rd, int rectx, int recty, ReportList *reports)
+{
OSErr err = noErr;
char name[2048];
@@ -599,13 +604,15 @@ int start_qt(struct Scene *scene, struct RenderData *rd, int rectx, int recty, R
}
-int append_qt(struct RenderData *rd, int frame, int *pixels, int rectx, int recty, ReportList *reports) {
+int append_qt(struct RenderData *rd, int frame, int *pixels, int rectx, int recty, ReportList *reports)
+{
QT_DoAddVideoSamplesToMedia(frame, pixels, rectx, recty, reports);
return 1;
}
-void end_qt(void) {
+void end_qt(void)
+{
OSErr err = noErr;
short resId = movieInDataForkResID;
@@ -639,7 +646,8 @@ void end_qt(void) {
}
-void free_qtcomponentdata(void) {
+void free_qtcomponentdata(void)
+{
if(qtdata) {
if(qtdata->theComponent) CloseComponent(qtdata->theComponent);
MEM_freeN(qtdata);
diff --git a/source/blender/quicktime/apple/quicktime_import.c b/source/blender/quicktime/apple/quicktime_import.c
index d7ef371873a..b58b4a646e2 100644
--- a/source/blender/quicktime/apple/quicktime_import.c
+++ b/source/blender/quicktime/apple/quicktime_import.c
@@ -249,7 +249,8 @@ int anim_is_quicktime (const char *name)
}
-void free_anim_quicktime (struct anim *anim) {
+void free_anim_quicktime (struct anim *anim)
+{
if (anim == NULL) return;
if (anim->qtime == NULL) return;