Merging r40572 through r40597 from trunk into soc-2011-tomato

[blender-staging.git] / source / blender / blenkernel / intern / sequencer.c

diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 743111b925fb25bf5b1f29c498962918ae2586d6..94fbd499e1483136593ec9aa66a6ccd23697d44f 100644 (file)
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -1325,6 +1325,10 @@ static void seq_proxy_build_frame(SeqRenderData context,
        quality = seq->strip->proxy->quality;
        ibuf->ftype= JPG | quality;
 
+       /* unsupported feature only confuses other s/w */
+       if(ibuf->depth==32)
+               ibuf->depth= 24;
+
        BLI_make_existing_file(name);
        
        ok = IMB_saveiff(ibuf, name, IB_rect | IB_zbuf | IB_zbuffloat);