FFmpeg: Added writing of WebM containers
This commit adds support for the WebM container. Previously we only supported the WebM/VP9 video codec, but still required that it was stored in a Matroska, MP4, or other compatible container format. Reviewed By: brecht Differential Revision: https://developer.blender.org/D5156
This commit is contained in:
parent
43b7512a59
commit
ca0b5529d0
|
@ -376,7 +376,7 @@ class RENDER_PT_encoding_video(RenderOutputButtonsPanel, Panel):
|
|||
layout = self.layout
|
||||
ffmpeg = context.scene.render.ffmpeg
|
||||
|
||||
needs_codec = ffmpeg.format in {'AVI', 'QUICKTIME', 'MKV', 'OGG', 'MPEG4'}
|
||||
needs_codec = ffmpeg.format in {'AVI', 'QUICKTIME', 'MKV', 'OGG', 'MPEG4', 'WEBM'}
|
||||
if needs_codec:
|
||||
layout.prop(ffmpeg, "codec")
|
||||
|
||||
|
|
|
@ -43,6 +43,7 @@ enum {
|
|||
FFMPEG_MKV = 9,
|
||||
FFMPEG_OGG = 10,
|
||||
FFMPEG_INVALID = 11,
|
||||
FFMPEG_WEBM = 12,
|
||||
};
|
||||
|
||||
enum {
|
||||
|
|
|
@ -319,6 +319,10 @@ static const char **get_file_extensions(int format)
|
|||
static const char *rv[] = {".ogv", ".ogg", NULL};
|
||||
return rv;
|
||||
}
|
||||
case FFMPEG_WEBM: {
|
||||
static const char *rv[] = {".webm", NULL};
|
||||
return rv;
|
||||
}
|
||||
default:
|
||||
return NULL;
|
||||
}
|
||||
|
|
|
@ -5171,6 +5171,7 @@ static void rna_def_scene_ffmpeg_settings(BlenderRNA *brna)
|
|||
{FFMPEG_OGG, "OGG", 0, "Ogg", ""},
|
||||
{FFMPEG_MKV, "MKV", 0, "Matroska", ""},
|
||||
{FFMPEG_FLV, "FLASH", 0, "Flash", ""},
|
||||
{FFMPEG_WEBM, "WEBM", 0, "WebM", ""},
|
||||
{0, NULL, 0, NULL, NULL},
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue