[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28559] trunk/blender/source/blender/ blenkernel/intern/writeffmpeg.c: Fix [#21353] Rendering h264 reports broken settings and fail.

[Xavier Thomas]

Revision: 28559
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28559
Author:   xat
Date:     2010-05-04 02:28:41 +0200 (Tue, 04 May 2010)

Log Message:
-----------
Fix [#21353] Rendering h264 reports broken settings and fail.
Also silenced a warning.

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

Modified: trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c	2010-05-04 00:06:13 UTC (rev 28558)
+++ trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c	2010-05-04 00:28:41 UTC (rev 28559)
@@ -362,7 +362,7 @@
 	}
 
 	if (c->pix_fmt != PIX_FMT_BGR32) {
-		sws_scale(img_convert_ctx, 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);
@@ -516,6 +516,12 @@
 		/* arghhhh ... */
 		c->pix_fmt = PIX_FMT_YUV420P;
 	}
+
+	if (codec_id == CODEC_ID_H264) {
+		/* correct wrong default ffmpeg param which crash x264 */
+		c->qmin=10;
+		c->qmax=51;
+	}
 	
 	if ((of->oformat->flags & AVFMT_GLOBALHEADER)
 //		|| !strcmp(of->oformat->name, "mp4")