archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

svn merge -r39145:39286 https://svn.blender.org/svnroot/bf-blender/trunk/blender

Browse Source
This commit is contained in:
Campbell Barton
2011-08-11 05:04:01 +00:00
parent 17e88915fd 50277c48ba
commit ef18ec335f
63 changed files with 6767 additions and 6743 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/blenkernel/intern/writeffmpeg.c
View File

@@ -657,10 +657,12 @@ static int start_ffmpeg_impl(struct RenderData *rd, int rectx, int recty, Report
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;
@@ -1313,6 +1315,9 @@ void ffmpeg_verify_image_type(RenderData *rd)
/* 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;
}