mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Buildfix for non-HAVE_FFMPEG builds

Browse Source
This commit is contained in:
twinaphex 2015-06-23 08:16:14 +02:00
parent 495315d244
commit d86c049e25
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configuration.c
View File

@ -2299,8 +2299,10 @@ bool config_save_file(const char *path)
settings->input.input_descriptor_hide_unbound);
config_set_bool(conf, "load_dummy_on_core_shutdown",
settings->load_dummy_on_core_shutdown);
#ifdef HAVE_FFMPEG
config_set_bool(conf, "builtin_mediaplayer_enable",
settings->mediaplayer.builtin_enable);
#endif
config_set_bool(conf, "fps_show", settings->fps_show);
config_set_bool(conf, "ui_menubar_enable", settings->ui.menubar_enable);
config_set_path(conf, "libretro_path", settings->libretro);

2
retroarch.c
View File

@ -1398,6 +1398,7 @@ void rarch_main_set_state(unsigned cmd)
if (driver->frontend_ctx && driver->frontend_ctx->content_loaded)
driver->frontend_ctx->content_loaded();
break;
#ifdef HAVE_FFMPEG
case RARCH_ACTION_STATE_LOAD_CONTENT_FFMPEG:
#ifdef HAVE_MENU
/* If content loading fails, we go back to menu. */
@ -1407,6 +1408,7 @@ void rarch_main_set_state(unsigned cmd)
if (driver->frontend_ctx && driver->frontend_ctx->content_loaded)
driver->frontend_ctx->content_loaded();
break;
#endif
case RARCH_ACTION_STATE_MENU_RUNNING_FINISHED:
#ifdef HAVE_MENU
menu_setting_apply_deferred();