diff options
| author | Damien Plisson <damien.plisson@yahoo.fr> | 2009-11-20 13:37:50 +0300 |
|---|---|---|
| committer | Damien Plisson <damien.plisson@yahoo.fr> | 2009-11-20 13:37:50 +0300 |
| commit | 68eaae8e0e58c664634633536622cb60084341b0 (patch) | |
| tree | 624a397841c450f88215126cf865a93dfcaa467d /source/blender/quicktime/apple/qtkit_import.m | |
| parent | 9672993bc1330a48e50ebc0f2f9742679085ed22 (diff) | |
Quicktime-qtkit : encoding settings now in blender ui (encoding panel)
- added "QuicktimeCodecSettings" struct in DNA
- old "QuicktimeCodecData" opaque struct is nowdeprecated (read only use when QuicktimeCodecSettings is not set)
- fixed small bug when importing deep color movies
Note that you may need Final Cut Pro installed to be able to use the DVCPRO HD codecs
Diffstat (limited to 'source/blender/quicktime/apple/qtkit_import.m')
| -rw-r--r-- | source/blender/quicktime/apple/qtkit_import.m | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/quicktime/apple/qtkit_import.m b/source/blender/quicktime/apple/qtkit_import.m index 980aa855822..500ee13330d 100644 --- a/source/blender/quicktime/apple/qtkit_import.m +++ b/source/blender/quicktime/apple/qtkit_import.m @@ -157,8 +157,9 @@ static ImBuf * nsImageToiBuf(NSImage *sourceImage, int width, int height) } } - if (([bitmapImage bitmapFormat] & 0x5) == 0) { - /* Try a fast copy if the image is a planar RGBA 32bit bitmap*/ + if (([bitmapImage bitsPerPixel] == 32) && (([bitmapImage bitmapFormat] & 0x5) == 0) + && ![bitmapImage isPlanar]) { + /* Try a fast copy if the image is a meshed RGBA 32bit bitmap*/ toIBuf = (uchar*)ibuf->rect; rasterRGB = (uchar*)[bitmapImage bitmapData]; for (y = 0; y < height; y++) { |