diff options
Diffstat (limited to 'source/blender/quicktime/apple')
-rw-r--r-- | source/blender/quicktime/apple/quicktime_export.c | 16 | ||||
-rw-r--r-- | source/blender/quicktime/apple/quicktime_import.c | 12 |
2 files changed, 14 insertions, 14 deletions
diff --git a/source/blender/quicktime/apple/quicktime_export.c b/source/blender/quicktime/apple/quicktime_export.c index d436b90502e..cdf8d6d1860 100644 --- a/source/blender/quicktime/apple/quicktime_export.c +++ b/source/blender/quicktime/apple/quicktime_export.c @@ -263,7 +263,7 @@ static OSErr QT_GetCodecSettingsFromScene(RenderData *rd, ReportList *reports) // if there is codecdata in the blendfile, convert it to a Quicktime handle if (qcd) { myHandle = NewHandle(qcd->cdSize); - PtrToHand( qcd->cdParms, &myHandle, qcd->cdSize); + PtrToHand(qcd->cdParms, &myHandle, qcd->cdSize); } // restore codecsettings to the quicktime component @@ -350,7 +350,7 @@ static void QT_CreateMyVideoTrack(int rectx, int recty, ReportList *reports) FixRatio(trackFrame.right, 1), FixRatio(trackFrame.bottom, 1), 0); - CheckError( GetMoviesError(), "NewMovieTrack error", reports ); + CheckError(GetMoviesError(), "NewMovieTrack error", reports); // SetIdentityMatrix(&myMatrix); // ScaleMatrix(&myMatrix, fixed1, Long2Fix(-1), 0, 0); @@ -362,10 +362,10 @@ static void QT_CreateMyVideoTrack(int rectx, int recty, ReportList *reports) qtdata->kVideoTimeScale, nil, 0); - CheckError( GetMoviesError(), "NewTrackMedia error", reports ); + CheckError(GetMoviesError(), "NewTrackMedia error", reports); err = BeginMediaEdits (qtexport->theMedia); - CheckError( err, "BeginMediaEdits error", reports ); + CheckError(err, "BeginMediaEdits error", reports); QT_StartAddVideoSamplesToMedia (&trackFrame, rectx, recty, reports); } @@ -378,14 +378,14 @@ static void QT_EndCreateMyVideoTrack(ReportList *reports) QT_EndAddVideoSamplesToMedia (); err = EndMediaEdits (qtexport->theMedia); - CheckError( err, "EndMediaEdits error", reports ); + CheckError(err, "EndMediaEdits error", reports); err = InsertMediaIntoTrack (qtexport->theTrack, kTrackStart, /* track start time */ kMediaStart, /* media start time */ GetMediaDuration (qtexport->theMedia), fixed1); - CheckError( err, "InsertMediaIntoTrack error", reports ); + CheckError(err, "InsertMediaIntoTrack error", reports); } @@ -515,7 +515,7 @@ void filepath_qt(char *string, RenderData *rd) BLI_make_existing_file(string); if (BLI_strcasecmp(string + strlen(string) - 4, ".mov")) { - sprintf(txt, "%04d-%04d.mov", (rd->sfra), (rd->efra) ); + sprintf(txt, "%04d-%04d.mov", (rd->sfra), (rd->efra)); strcat(string, txt); } } @@ -684,7 +684,7 @@ static void check_renderbutton_framerate(RenderData *rd, ReportList *reports) } err = SCSetInfo(qtdata->theComponent, scTemporalSettingsType, &qtdata->gTemporalSettings); - CheckError( err, "SCSetInfo error", reports ); + CheckError(err, "SCSetInfo error", reports); if (qtdata->gTemporalSettings.frameRate == 1571553) { // 23.98 fps qtdata->kVideoTimeScale = 24000; diff --git a/source/blender/quicktime/apple/quicktime_import.c b/source/blender/quicktime/apple/quicktime_import.c index f5601fb5b8c..804f7b271de 100644 --- a/source/blender/quicktime/apple/quicktime_import.c +++ b/source/blender/quicktime/apple/quicktime_import.c @@ -176,7 +176,7 @@ char *get_valid_qtname(char *name) #endif /* _WIN32 */ -int anim_is_quicktime (const char *name) +int anim_is_quicktime(const char *name) { FSSpec theFSSpec; char theFullPath[255]; @@ -255,7 +255,7 @@ 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; @@ -263,12 +263,12 @@ void free_anim_quicktime (struct anim *anim) UnlockPixels(anim->qtime->offscreenPixMap); if (anim->qtime->have_gw) - DisposeGWorld( anim->qtime->offscreenGWorld ); + DisposeGWorld(anim->qtime->offscreenGWorld); if (anim->qtime->ibuf) IMB_freeImBuf(anim->qtime->ibuf); - DisposeMovie( anim->qtime->movie ); - CloseMovieFile( anim->qtime->movieRefNum ); + DisposeMovie(anim->qtime->movie); + CloseMovieFile(anim->qtime->movieRefNum); if (anim->qtime->frameIndex) MEM_freeN (anim->qtime->frameIndex); if (anim->qtime) MEM_freeN (anim->qtime); @@ -440,7 +440,7 @@ static short GetFirstVideoTrackPixelDepth(struct anim *anim) } -int startquicktime (struct anim *anim) +int startquicktime(struct anim *anim) { FSSpec theFSSpec; |