From c13b98da8a876689c2ac01f223027a5b0874609e Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 21 Jun 2015 00:37:19 +0200
Subject: [PATCH] (Griffin) Update Griffin

---
 Makefile.common                              |  2 +-
 griffin/griffin.c                            | 14 +++++++++++++-
 record/drivers/{ffmpeg.c => record_ffmpeg.c} |  0
 3 files changed, 14 insertions(+), 2 deletions(-)
 rename record/drivers/{ffmpeg.c => record_ffmpeg.c} (100%)

diff --git a/Makefile.common b/Makefile.common
index d8cb687808..9f2a993fa9 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -797,7 +797,7 @@ endif
 # Record
 
 ifeq ($(HAVE_FFMPEG), 1)
-   OBJ += record/drivers/ffmpeg.o \
+   OBJ += record/drivers/record_ffmpeg.o \
 			 cores/ffmpeg_core.o
    LIBS += $(AVCODEC_LIBS) $(AVFORMAT_LIBS) $(AVUTIL_LIBS) $(SWSCALE_LIBS) $(SWRESAMPLE_LIBS) $(FFMPEG_LIBS)
    DEFINES += $(AVCODEC_CFLAGS) $(AVFORMAT_CFLAGS) $(AVUTIL_CFLAGS) $(SWSCALE_CFLAGS) $(SWRESAMPLE_CFLAGS)
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 99afd9eda0..40ccbe7de7 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -548,10 +548,17 @@ DYNAMIC
 ============================================================ */
 #include "../libretro-common/dynamic/dylib.c"
 #include "../dynamic.c"
-#include "../cores/dynamic_dummy.c"
 #include "../gfx/video_filter.c"
 #include "../audio/audio_dsp_filter.c"
 
+/*============================================================
+CORES
+============================================================ */
+#ifdef HAVE_FFMPEG
+#include "../cores/ffmpeg_core.c"
+#endif
+
+#include "../cores/dynamic_dummy.c"
 
 /*============================================================
 FILE
@@ -658,6 +665,7 @@ RETROARCH
 #include "../runloop.c"
 #include "../runloop_data.c"
 
+
 /*============================================================
 RECORDING
 ============================================================ */
@@ -665,6 +673,10 @@ RECORDING
 #include "../record/record_driver.c"
 #include "../record/drivers/record_null.c"
 
+#ifdef HAVE_FFMPEG
+#include "../record/drivers/record_ffmpeg.c"
+#endif
+
 /*============================================================
 THREAD
 ============================================================ */
diff --git a/record/drivers/ffmpeg.c b/record/drivers/record_ffmpeg.c
similarity index 100%
rename from record/drivers/ffmpeg.c
rename to record/drivers/record_ffmpeg.c