diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-02-14 00:47:29 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-02-14 00:47:29 +0400 |
commit | 0fbff1be3ee74f687d46650f546de8d09b3123fd (patch) | |
tree | 70bdc7045d43cb9a94f4ef38b551daf369cf4931 /source/blender/quicktime/apple/qtkit_export.m | |
parent | 62fa555b8e73fd72f353ad25acc505c7d8c729b0 (diff) |
Fix quicktime export being broken in various ways: callback was missing
parameter, codec RNA wrapping was wrong, and there was a python script error.
Diffstat (limited to 'source/blender/quicktime/apple/qtkit_export.m')
-rw-r--r-- | source/blender/quicktime/apple/qtkit_export.m | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/source/blender/quicktime/apple/qtkit_export.m b/source/blender/quicktime/apple/qtkit_export.m index 045ef973e91..f709572d0bb 100644 --- a/source/blender/quicktime/apple/qtkit_export.m +++ b/source/blender/quicktime/apple/qtkit_export.m @@ -595,8 +595,7 @@ int start_qt(struct Scene *scene, struct RenderData *rd, int rectx, int recty, R return success; } - -int append_qt(struct RenderData *rd, int frame, int *pixels, int rectx, int recty, ReportList *reports) +int append_qt(struct RenderData *rd, int start_frame, int frame, int *pixels, int rectx, int recty, ReportList *reports) { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; NSBitmapImageRep *blBitmapFormatImage; @@ -604,14 +603,12 @@ int append_qt(struct RenderData *rd, int frame, int *pixels, int rectx, int rect OSStatus err = noErr; unsigned char *from_Ptr,*to_Ptr; int y,from_i,to_i; - BOOL alpha = (rd->im_format.planes == R_IMF_PLANES_RGBA)? YES: NO; - /* Create bitmap image rep in blender format (32bit RGBA) */ blBitmapFormatImage = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:NULL pixelsWide:rectx pixelsHigh:recty - bitsPerSample:8 samplesPerPixel:4 hasAlpha:alpha isPlanar:NO + bitsPerSample:8 samplesPerPixel:4 hasAlpha:YES isPlanar:NO colorSpaceName:NSCalibratedRGBColorSpace bitmapFormat:NSAlphaNonpremultipliedBitmapFormat bytesPerRow:rectx*4 |