diff options
Diffstat (limited to 'source/blender/quicktime/apple/quicktime_export.c')
-rw-r--r-- | source/blender/quicktime/apple/quicktime_export.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/source/blender/quicktime/apple/quicktime_export.c b/source/blender/quicktime/apple/quicktime_export.c index 8f12e40b04a..c1291fc6949 100644 --- a/source/blender/quicktime/apple/quicktime_export.c +++ b/source/blender/quicktime/apple/quicktime_export.c @@ -123,7 +123,7 @@ static int sframe; /* RNA functions */ -static QuicktimeCodecTypeDesc qtCodecList[] = { +static QuicktimeCodecTypeDesc qtVideoCodecList[] = { {kRawCodecType, 1, "Uncompressed"}, {kJPEGCodecType, 2, "JPEG"}, {kMotionJPEGACodecType, 3, "M-JPEG A"}, @@ -138,34 +138,34 @@ static QuicktimeCodecTypeDesc qtCodecList[] = { {kH264CodecType, 12, "H.264"}, {0,0,NULL}}; -static int qtCodecCount = 12; +static int qtVideoCodecCount = 12; -int quicktime_get_num_codecs() { - return qtCodecCount; +int quicktime_get_num_videocodecs() { + return qtVideoCodecCount; } -QuicktimeCodecTypeDesc* quicktime_get_codecType_desc(int indexValue) { - if ((indexValue>=0) && (indexValue < qtCodecCount)) - return &qtCodecList[indexValue]; +QuicktimeCodecTypeDesc* quicktime_get_videocodecType_desc(int indexValue) { + if ((indexValue>=0) && (indexValue < qtVideoCodecCount)) + return &qtVideoCodecList[indexValue]; else return NULL; } -int quicktime_rnatmpvalue_from_codectype(int codecType) { +int quicktime_rnatmpvalue_from_videocodectype(int codecType) { int i; - for (i=0;i<qtCodecCount;i++) { - if (qtCodecList[i].codecType == codecType) - return qtCodecList[i].rnatmpvalue; + for (i=0;i<qtVideoCodecCount;i++) { + if (qtVideoCodecList[i].codecType == codecType) + return qtVideoCodecList[i].rnatmpvalue; } return 0; } -int quicktime_codecType_from_rnatmpvalue(int rnatmpvalue) { +int quicktime_videocodecType_from_rnatmpvalue(int rnatmpvalue) { int i; - for (i=0;i<qtCodecCount;i++) { - if (qtCodecList[i].rnatmpvalue == rnatmpvalue) - return qtCodecList[i].codecType; + for (i=0;i<qtVideoCodecCount;i++) { + if (qtVideoCodecList[i].rnatmpvalue == rnatmpvalue) + return qtVideoCodecList[i].codecType; } return 0; @@ -494,7 +494,7 @@ void filepath_qt(char *string, RenderData *rd) { if (string==0) return; strcpy(string, rd->pic); - BLI_convertstringcode(string, G.sce); + BLI_path_abs(string, G.sce); BLI_make_existing_file(string); @@ -871,20 +871,20 @@ int fromcocoa_request_qtcodec_settings(bContext *C, wmOperator *op) void SCENE_OT_render_data_set_quicktime_codec(wmOperatorType *ot) { /* identifiers */ - ot->name= "Change codec"; - ot->description= "Change Quicktime codec Settings"; - ot->idname= "SCENE_OT_render_data_set_quicktime_codec"; + ot->name= "Change codec"; + ot->description= "Change Quicktime codec Settings"; + ot->idname= "SCENE_OT_render_data_set_quicktime_codec"; - /* api callbacks */ + /* api callbacks */ #if defined(__APPLE__) && defined(GHOST_COCOA) ot->exec = cocoa_request_qtcodec_settings; #else - ot->exec= request_qtcodec_settings; + ot->exec= request_qtcodec_settings; #endif - ot->poll= ED_operator_setqtcodec; + ot->poll= ED_operator_setqtcodec; - /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + /* flags */ + ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; } #endif /* USE_QTKIT */ |