Fix T45814: Writing MP4, h.264 not supported
authorCampbell Barton <ideasman42@gmail.com>
Mon, 24 Aug 2015 22:51:04 +0000 (08:51 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 24 Aug 2015 22:51:04 +0000 (08:51 +1000)
release/scripts/startup/bl_ui/properties_render.py
source/blender/blenkernel/intern/writeffmpeg.c

index 88b7e0802cef11f001c2146dd254e88f30464eec..e528f6358bc089ff952e6891b02f1b3ecef9a7b7 100644 (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")
index 8969d6694ff6fd68df68583ce1cb06f09c684017..0668e7f95e2afff03f8ebc50ea56d59df65a41fb 100644 (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) {