Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Schlaile <peter@schlaile.de>2008-05-12 13:01:15 +0400
committerPeter Schlaile <peter@schlaile.de>2008-05-12 13:01:15 +0400
commit97dd2fe33e07ae96a48022165a5f2205163f59a3 (patch)
tree622c70fd810031e9a1f93730dfa6aeebfc531833 /source/blender/blenkernel/intern/writeffmpeg.c
parentb01e2c4a84ec71ccca28e7a5e5f950eb1a32a7a4 (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/blender/blenkernel/intern/writeffmpeg.c')
-rw-r--r--source/blender/blenkernel/intern/writeffmpeg.c4
1 files changed, 4 insertions, 0 deletions
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;
}