libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-28 18:50:29 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Clean up ifdef properly this time ...

Browse Source
This commit is contained in:
Themaister 2012-06-22 19:03:46 +02:00
parent 4711b6c7e3
commit 951721d2ab
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dynamic.c
View File

@ -235,13 +235,8 @@ static bool environment_cb(unsigned cmd, void *data)
break;
case RETRO_ENVIRONMENT_GET_CAN_DUPE:
#ifdef HAVE_FFMPEG
*(bool*)data = true;
RARCH_LOG("Environ GET_CAN_DUPE: true\n");
#else
*(bool*)data = false;
RARCH_LOG("Environ GET_CAN_DUPE: false\n");
#endif
break;
case RETRO_ENVIRONMENT_GET_VARIABLE:

16
retroarch.c
View File

@ -198,8 +198,8 @@ static void video_frame(const void *data, unsigned width, unsigned height, size_
// Slightly messy code,
// but we really need to do processing before blocking on VSync for best possible scheduling.
#ifdef HAVE_FFMPEG
bool is_dupe = !data;
#ifdef HAVE_FFMPEG
if (g_extern.recording && (!g_extern.filter.active || !g_settings.video.post_filter_record || is_dupe))
{
@ -211,10 +211,9 @@ static void video_frame(const void *data, unsigned width, unsigned height, size_
ffemu_data.is_dupe = is_dupe;
ffemu_push_video(g_extern.rec, &ffemu_data);
}
#endif
if (is_dupe)
return;
#endif
const char *msg = msg_queue_pull(g_extern.msg_queue);
@ -270,13 +269,10 @@ void rarch_render_cached_frame(void)
// Not 100% safe, since the library might have
// freed the memory, but no known implementations do this :D
// It would be really stupid at any rate ...
#ifndef RARCH_CONSOLE
if (g_extern.frame_cache.data)
#endif
video_frame(g_extern.frame_cache.data,
g_extern.frame_cache.width,
g_extern.frame_cache.height,
g_extern.frame_cache.pitch);
video_frame(g_extern.frame_cache.data,
g_extern.frame_cache.width,
g_extern.frame_cache.height,
g_extern.frame_cache.pitch);
#ifdef HAVE_FFMPEG
g_extern.recording = recording;