blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Fix T45814: Writing MP4, h.264 not supported

This commit is contained in:
Campbell Barton 2015-08-25 08:51:04 +10:00
parent 1080a7d5e1
commit a7dd20983a
Notes: blender-bot 2023-02-14 10:54:29 +01:00 
Referenced by issue #45814, Impossible to do a .mp4 h.264 video
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/startup/bl_ui/properties_render.py
View File

@ -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")

2
source/blender/blenkernel/intern/writeffmpeg.c
View File

@ -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) {