diff options
Diffstat (limited to 'source/blender/quicktime/apple')
| -rw-r--r-- | source/blender/quicktime/apple/qtkit_export.m | 7 | ||||
| -rw-r--r-- | source/blender/quicktime/apple/qtkit_import.m | 3 | ||||
| -rw-r--r-- | source/blender/quicktime/apple/quicktime_export.c | 2 |
3 files changed, 6 insertions, 6 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 diff --git a/source/blender/quicktime/apple/qtkit_import.m b/source/blender/quicktime/apple/qtkit_import.m index 4c2bcee0150..633d92e05c1 100644 --- a/source/blender/quicktime/apple/qtkit_import.m +++ b/source/blender/quicktime/apple/qtkit_import.m @@ -86,6 +86,9 @@ int anim_is_quicktime (const char *name) BLI_testextensie(name, ".txt") || BLI_testextensie(name, ".mpg") || BLI_testextensie(name, ".avi") || // wouldnt be appropriate ;) + BLI_testextensie(name, ".mov") || // disabled, suboptimal decoding speed + BLI_testextensie(name, ".mp4") || // disabled, suboptimal decoding speed + BLI_testextensie(name, ".m4v") || // disabled, suboptimal decoding speed BLI_testextensie(name, ".tga") || BLI_testextensie(name, ".png") || BLI_testextensie(name, ".bmp") || diff --git a/source/blender/quicktime/apple/quicktime_export.c b/source/blender/quicktime/apple/quicktime_export.c index 101fcc0a732..71cf87517f5 100644 --- a/source/blender/quicktime/apple/quicktime_export.c +++ b/source/blender/quicktime/apple/quicktime_export.c @@ -604,7 +604,7 @@ int start_qt(struct Scene *scene, struct RenderData *rd, int rectx, int recty, R } -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) { QT_DoAddVideoSamplesToMedia(frame, pixels, rectx, recty, reports); return 1; |