archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix use of deprecated im_type member in quicktime export.

Browse Source
This commit is contained in:
Brecht Van Lommel
2011-12-16 22:33:22 +00:00
parent 5fa014ff02
commit c82fdb8e41
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/quicktime/apple/qtkit_export.m
View File

@@ -658,7 +658,7 @@ int append_qt(struct RenderData *rd, int frame, int *pixels, int rectx, int rect
}
else {
//Error getting audio packets
BKE_reportf(reports, RPT_ERROR, "Unable to get further audio packets from frame %i, error = 0x%x",qtexport->audioTotalExportedFrames,err);
BKE_reportf(reports, RPT_ERROR, "Unable to get further audio packets from frame %i, error = 0x%x",(int)qtexport->audioTotalExportedFrames,err);
break;
}
@@ -779,7 +779,7 @@ void free_qtcomponentdata(void) {
void quicktime_verify_image_type(RenderData *rd)
{
if (rd->imtype == R_IMF_IMTYPE_QUICKTIME) {
if (rd->im_format.imtype == R_IMF_IMTYPE_QUICKTIME) {
if ((rd->qtcodecsettings.codecType<= 0) ||
(rd->qtcodecsettings.codecSpatialQuality <0) ||
(rd->qtcodecsettings.codecSpatialQuality > 100)) {

2
source/blender/quicktime/apple/quicktime_export.c
View File

@@ -689,7 +689,7 @@ static void check_renderbutton_framerate(RenderData *rd, ReportList *reports)
void quicktime_verify_image_type(RenderData *rd)
{
if (rd->imtype == R_IMF_IMTYPE_QUICKTIME) {
if (rd->im_format.imtype == R_IMF_IMTYPE_QUICKTIME) {
if ((rd->qtcodecsettings.codecType== 0) ||
(rd->qtcodecsettings.codecSpatialQuality <0) ||
(rd->qtcodecsettings.codecSpatialQuality > 100)) {