diff options
author | Thomas Dinges <blender@dingto.org> | 2011-12-24 02:07:34 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2011-12-24 02:07:34 +0400 |
commit | 9bb030322138dbfee7385e5066146a74cc057268 (patch) | |
tree | 157f476aa29f17bda804ae82cfbc4790d9badcdd /source/blender/quicktime | |
parent | ddcf56366d47c08ebfb6bb9e6d1cbd54b1db706c (diff) |
Bugfix for [#29684] Output video presets messed up
* This was caused ny the ImageType refactor.
* Problem persisted with Quicktime too, could not test that, but should fix presets there too.
Diffstat (limited to 'source/blender/quicktime')
-rw-r--r-- | source/blender/quicktime/apple/qtkit_export.m | 4 | ||||
-rw-r--r-- | source/blender/quicktime/apple/quicktime_export.c | 4 | ||||
-rw-r--r-- | source/blender/quicktime/quicktime_export.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/quicktime/apple/qtkit_export.m b/source/blender/quicktime/apple/qtkit_export.m index 75c7d890ddd..8fd04026233 100644 --- a/source/blender/quicktime/apple/qtkit_export.m +++ b/source/blender/quicktime/apple/qtkit_export.m @@ -777,9 +777,9 @@ void end_qt(void) void free_qtcomponentdata(void) { } -void quicktime_verify_image_type(RenderData *rd) +void quicktime_verify_image_type(RenderData *rd, ImageFormatData *imf) { - if (rd->im_format.imtype == R_IMF_IMTYPE_QUICKTIME) { + if (imf->imtype == R_IMF_IMTYPE_QUICKTIME) { if ((rd->qtcodecsettings.codecType<= 0) || (rd->qtcodecsettings.codecSpatialQuality <0) || (rd->qtcodecsettings.codecSpatialQuality > 100)) { diff --git a/source/blender/quicktime/apple/quicktime_export.c b/source/blender/quicktime/apple/quicktime_export.c index 937e1b6be46..5dfce9d3e80 100644 --- a/source/blender/quicktime/apple/quicktime_export.c +++ b/source/blender/quicktime/apple/quicktime_export.c @@ -687,9 +687,9 @@ static void check_renderbutton_framerate(RenderData *rd, ReportList *reports) } } -void quicktime_verify_image_type(RenderData *rd) +void quicktime_verify_image_type(RenderData *rd, ImageFormatData *imf) { - if (rd->im_format.imtype == R_IMF_IMTYPE_QUICKTIME) { + if (imf->imtype == R_IMF_IMTYPE_QUICKTIME) { if ((rd->qtcodecsettings.codecType== 0) || (rd->qtcodecsettings.codecSpatialQuality <0) || (rd->qtcodecsettings.codecSpatialQuality > 100)) { diff --git a/source/blender/quicktime/quicktime_export.h b/source/blender/quicktime/quicktime_export.h index 517e0c8c0f6..f64521bda35 100644 --- a/source/blender/quicktime/quicktime_export.h +++ b/source/blender/quicktime/quicktime_export.h @@ -61,7 +61,7 @@ void end_qt(void); void filepath_qt(char *string, struct RenderData *rd); /*RNA helper functions */ -void quicktime_verify_image_type(struct RenderData *rd); //used by RNA for defaults values init, if needed +void quicktime_verify_image_type(struct RenderData *rd, struct ImageFormatData *imf); //used by RNA for defaults values init, if needed /*Video codec type*/ int quicktime_get_num_videocodecs(void); QuicktimeCodecTypeDesc* quicktime_get_videocodecType_desc(int indexValue); |