Merged changes in the trunk up to revision 42116.
[blender.git] / source / blender / blenkernel / intern / movieclip.c
index 540d757f0c9d037d1bd3c5175dd12ddd5150bef1..382e1d7038723cb2ebb75fb485aa2b6462fe115f 100644 (file)
@@ -895,7 +895,7 @@ void BKE_movieclip_update_scopes(MovieClip *clip, MovieClipUser *user, MovieClip
 
 static void movieclip_build_proxy_ibuf(MovieClip *clip, ImBuf *ibuf, int cfra, int proxy_render_size, int undistorted)
 {
-       char name[FILE_MAXFILE+FILE_MAXDIR];
+       char name[FILE_MAX];
        int quality, rectx, recty;
        int size= size= rendersize_to_number(proxy_render_size);
        ImBuf *scaleibuf;
@@ -913,8 +913,8 @@ static void movieclip_build_proxy_ibuf(MovieClip *clip, ImBuf *ibuf, int cfra, i
        scaleibuf->ftype= JPG | quality;
 
        /* unsupported feature only confuses other s/w */
-       if(scaleibuf->depth==32)
-               scaleibuf->depth= 24;
+       if(scaleibuf->planes==32)
+               scaleibuf->planes= 24;
 
        BLI_lock_thread(LOCK_MOVIECLIP);