Skip to content

Commit 1a1cc0f

Browse files
committed
Merge pull request #105982 from roughbits01/movie-writer-issue
Only instantiate `MovieWriterMJPEG` and `MovieWriterPNGWAV` movie writers if they are enabled
2 parents 5bc01f2 + 55dd5d5 commit 1a1cc0f

File tree

1 file changed

+14
-7
lines changed

1 file changed

+14
-7
lines changed

servers/register_server_types.cpp

+14-7
Original file line numberDiff line numberDiff line change
@@ -342,11 +342,15 @@ void register_server_types() {
342342
GDREGISTER_ABSTRACT_CLASS(XRTracker);
343343
#endif // XR_DISABLED
344344

345-
writer_mjpeg = memnew(MovieWriterMJPEG);
346-
MovieWriter::add_writer(writer_mjpeg);
345+
if (GD_IS_CLASS_ENABLED(MovieWriterMJPEG)) {
346+
writer_mjpeg = memnew(MovieWriterMJPEG);
347+
MovieWriter::add_writer(writer_mjpeg);
348+
}
347349

348-
writer_pngwav = memnew(MovieWriterPNGWAV);
349-
MovieWriter::add_writer(writer_pngwav);
350+
if (GD_IS_CLASS_ENABLED(MovieWriterPNGWAV)) {
351+
writer_pngwav = memnew(MovieWriterPNGWAV);
352+
MovieWriter::add_writer(writer_pngwav);
353+
}
350354

351355
OS::get_singleton()->benchmark_end_measure("Servers", "Register Extensions");
352356
}
@@ -356,9 +360,12 @@ void unregister_server_types() {
356360

357361
ServersDebugger::deinitialize();
358362
memdelete(shader_types);
359-
memdelete(writer_mjpeg);
360-
memdelete(writer_pngwav);
361-
363+
if (GD_IS_CLASS_ENABLED(MovieWriterMJPEG)) {
364+
memdelete(writer_mjpeg);
365+
}
366+
if (GD_IS_CLASS_ENABLED(MovieWriterPNGWAV)) {
367+
memdelete(writer_pngwav);
368+
}
362369
OS::get_singleton()->benchmark_end_measure("Servers", "Unregister Extensions");
363370
}
364371

0 commit comments

Comments
 (0)