[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39243] trunk/blender/source/blender/ blenkernel/intern/writeffmpeg.c: fix for [#28201] blender crashes when " mpeg" selected

[Campbell Barton]

Revision: 39243
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39243
Author:   campbellbarton
Date:     2011-08-10 07:36:44 +0000 (Wed, 10 Aug 2011)
Log Message:
-----------
fix for [#28201] blender crashes when "mpeg" selected

2 changes
- When writing OGG only allow Theora encoding, this fixes the crash.
- When setting the MPEG preset, dont allow the 'Codec' to be left as Theora, this is just confusing.

* note that this is highly confusing for users and devs - there are 4 places to set the codec/format, with both python and C presets :S.

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	2011-08-10 05:41:00 UTC (rev 39242)
+++ trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c	2011-08-10 07:36:44 UTC (rev 39243)
@@ -658,10 +658,12 @@
 	switch(ffmpeg_type) {
 	case FFMPEG_AVI:
 	case FFMPEG_MOV:
-	case FFMPEG_OGG:
 	case FFMPEG_MKV:
 		fmt->video_codec = ffmpeg_codec;
 		break;
+	case FFMPEG_OGG:
+		fmt->video_codec = CODEC_ID_THEORA;
+		break;
 	case FFMPEG_DV:
 		fmt->video_codec = CODEC_ID_DVVIDEO;
 		break;
@@ -1310,6 +1312,9 @@
 			/* Don't set preset, disturbs render resolution.
 			 * ffmpeg_set_preset(rd, FFMPEG_PRESET_DVD); */
 		}
+		if(rd->ffcodecdata.type == FFMPEG_OGG) {
+			rd->ffcodecdata.type = FFMPEG_MPEG2;
+		}
 
 		audio= 1;
 	}