[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29247] trunk/blender/source/blender: revert changes in own commit to fix warnings, was giving warnings with a newer swscale

[Campbell Barton]

Revision: 29247
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29247
Author:   campbellbarton
Date:     2010-06-05 18:52:19 +0200 (Sat, 05 Jun 2010)

Log Message:
-----------
revert changes in own commit to fix warnings, was giving warnings with a newer 
swscale

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
    trunk/blender/source/blender/imbuf/intern/anim.c

Modified: trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c        
2010-06-05 16:09:35 UTC (rev 29246)
+++ trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c        
2010-06-05 16:52:19 UTC (rev 29247)
@@ -362,7 +362,7 @@
        }
 
        if (c->pix_fmt != PIX_FMT_BGR32) {
-               sws_scale(img_convert_ctx, (uint8_t **) rgb_frame->data,
+               sws_scale(img_convert_ctx, (const uint8_t * const*) 
rgb_frame->data,
                          rgb_frame->linesize, 0, c->height, 
                          current_frame->data, current_frame->linesize);
                delete_picture(rgb_frame);

Modified: trunk/blender/source/blender/imbuf/intern/anim.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/anim.c    2010-06-05 16:09:35 UTC 
(rev 29246)
+++ trunk/blender/source/blender/imbuf/intern/anim.c    2010-06-05 16:52:19 UTC 
(rev 29247)
@@ -816,7 +816,7 @@
                                        unsigned char* top;
 
                                        sws_scale(anim->img_convert_ctx,
-                                                 (uint8_t **)input->data,
+                                                 (const uint8_t * const 
*)input->data,
                                                  input->linesize,
                                                  0,
                                                  anim->pCodecCtx->height,
@@ -875,7 +875,7 @@
                                        unsigned char* r;
        
                                        sws_scale(anim->img_convert_ctx,
-                                                 (uint8_t **)input->data,
+                                                 (const uint8_t * const 
*)input->data,
                                                  input->linesize,
                                                  0,
                                                  anim->pCodecCtx->height,


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs