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/blender/blenkernel | |
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/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_writeffmpeg.h | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/writeffmpeg.c | 4 |
2 files changed, 5 insertions, 0 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; } |