sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

== FFMPEG ==

Browse Source 
Added (disabled) MKV support. Might come handy later, if someone finds
out, why it instantly crashes after 2 frames.

Made it impossible to set min_rate higher than max_rate in render buttons
panel.
This commit is contained in:
Peter Schlaile 2008-05-12 09:01:15 +00:00
parent b01e2c4a84
commit 97dd2fe33e
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenkernel/BKE_writeffmpeg.h
View File

@ -43,6 +43,7 @@ extern "C" {
#define FFMPEG_H264 6
#define FFMPEG_XVID 7
#define FFMPEG_FLV 8
#define FFMPEG_MKV 9
#define FFMPEG_CODEC_MPEG1 0
#define FFMPEG_CODEC_MPEG2 1

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

@ -226,6 +226,10 @@ static const char** get_file_extensions(int format)
static const char * rv[] = { ".flv", NULL };
return rv;
}
case FFMPEG_MKV: {
static const char * rv[] = { ".mkv", NULL };
return rv;
}
default:
return NULL;
}

9
source/blender/src/buttons_scene.c
View File

@ -2789,8 +2789,10 @@ static void render_panel_ffmpeg_video(void)
&G.scene->r.ffcodecdata.video_bitrate,
1, 14000, 0, 0, "Video bitrate(kb/s)");
uiDefButI(block, NUM, B_DIFF, "Min Rate",
xcol1, yofs+22, 110, 20, &G.scene->r.ffcodecdata.rc_min_rate,
0, 14000, 0, 0, "Rate control: min rate(kb/s)");
xcol1, yofs+22, 110, 20,
&G.scene->r.ffcodecdata.rc_min_rate,
0, G.scene->r.ffcodecdata.rc_max_rate,
0, 0, "Rate control: min rate(kb/s)");
uiDefButI(block, NUM, B_DIFF, "Max Rate",
xcol1, yofs, 110, 20, &G.scene->r.ffcodecdata.rc_max_rate,
1, 14000, 0, 0, "Rate control: max rate(kb/s)");
@ -2823,7 +2825,8 @@ static void render_panel_ffmpeg_video(void)
0, 1, 0,0, "Autosplit output at 2GB boundary.");
if (ELEM(G.scene->r.ffcodecdata.type, FFMPEG_AVI, FFMPEG_MOV)) {
if (ELEM3(G.scene->r.ffcodecdata.type, FFMPEG_AVI,
FFMPEG_MOV, FFMPEG_MKV)) {
uiDefBut(block, LABEL, 0, "Codec",
xcol1, yofs-44, 110, 20, 0, 0, 0, 0, 0, "");
uiDefButI(block, MENU,B_REDR, ffmpeg_codec_pup(),