diff options
| author | Peter Schlaile <peter@schlaile.de> | 2008-05-12 13:01:15 +0400 |
|---|---|---|
| committer | Peter Schlaile <peter@schlaile.de> | 2008-05-12 13:01:15 +0400 |
| commit | 97dd2fe33e07ae96a48022165a5f2205163f59a3 (patch) | |
| tree | 622c70fd810031e9a1f93730dfa6aeebfc531833 /source | |
| parent | b01e2c4a84ec71ccca28e7a5e5f950eb1a32a7a4 (diff) | |
== FFMPEG ==
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.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/BKE_writeffmpeg.h | 1 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/writeffmpeg.c | 4 | ||||
| -rw-r--r-- | source/blender/src/buttons_scene.c | 9 |
3 files changed, 11 insertions, 3 deletions
diff --git a/source/blender/blenkernel/BKE_writeffmpeg.h b/source/blender/blenkernel/BKE_writeffmpeg.h index 86ad67f76b0..7819919fba8 100644 --- a/source/blender/blenkernel/BKE_writeffmpeg.h +++ b/source/blender/blenkernel/BKE_writeffmpeg.h @@ -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 diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c index 51ab7365c01..c95e3d20442 100644 --- a/source/blender/blenkernel/intern/writeffmpeg.c +++ b/source/blender/blenkernel/intern/writeffmpeg.c @@ -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; } diff --git a/source/blender/src/buttons_scene.c b/source/blender/src/buttons_scene.c index d3311af51e0..239710ed785 100644 --- a/source/blender/src/buttons_scene.c +++ b/source/blender/src/buttons_scene.c @@ -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(), |