diff options
-rw-r--r-- | release/scripts/startup/bl_ui/properties_render.py | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/writeffmpeg.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py index 88b7e0802ce..e528f6358bc 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -459,7 +459,7 @@ class RENDER_PT_encoding(RenderButtonsPanel, Panel): split = layout.split() split.prop(rd.ffmpeg, "format") - if ffmpeg.format in {'AVI', 'QUICKTIME', 'MKV', 'OGG'}: + if ffmpeg.format in {'AVI', 'QUICKTIME', 'MKV', 'OGG', 'MPEG4'}: split.prop(ffmpeg, "codec") elif rd.ffmpeg.format == 'H264': split.prop(ffmpeg, "use_lossless_output") diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c index 8969d6694ff..0668e7f95e2 100644 --- a/source/blender/blenkernel/intern/writeffmpeg.c +++ b/source/blender/blenkernel/intern/writeffmpeg.c @@ -894,7 +894,7 @@ static int start_ffmpeg_impl(FFMpegContext *context, struct RenderData *rd, int break; case FFMPEG_MPEG4: default: - fmt->video_codec = AV_CODEC_ID_MPEG4; + fmt->video_codec = context->ffmpeg_codec; break; } if (fmt->video_codec == AV_CODEC_ID_DVVIDEO) { |