CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-03-01 16:15:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move ffmpeg core files

Browse Source
This commit is contained in:
twinaphex 2015-10-19 16:55:08 +02:00
parent a25bc08d60
commit 1e681cad4e
7 changed files with 2198 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.common
View File

@ -872,7 +872,7 @@ endif
ifeq ($(HAVE_FFMPEG), 1) ifeq ($(HAVE_FFMPEG), 1)
OBJ += record/drivers/record_ffmpeg.o \ OBJ += record/drivers/record_ffmpeg.o \
cores/ffmpeg_core.o cores/libretro-ffmpeg/ffmpeg_core.o
LIBS += $(AVCODEC_LIBS) $(AVFORMAT_LIBS) $(AVUTIL_LIBS) $(SWSCALE_LIBS) $(SWRESAMPLE_LIBS) $(FFMPEG_LIBS) LIBS += $(AVCODEC_LIBS) $(AVFORMAT_LIBS) $(AVUTIL_LIBS) $(SWSCALE_LIBS) $(SWRESAMPLE_LIBS) $(FFMPEG_LIBS)
DEFINES += $(AVCODEC_CFLAGS) $(AVFORMAT_CFLAGS) $(AVUTIL_CFLAGS) $(SWSCALE_CFLAGS) $(SWRESAMPLE_CFLAGS) DEFINES += $(AVCODEC_CFLAGS) $(AVFORMAT_CFLAGS) $(AVUTIL_CFLAGS) $(SWSCALE_CFLAGS) $(SWRESAMPLE_CFLAGS)
DEFINES += -DHAVE_FFMPEG -Iffmpeg DEFINES += -DHAVE_FFMPEG -Iffmpeg

2188
cores/libretro-ffmpeg/Makefile Normal file
View File

File diff suppressed because it is too large Load Diff

3
cores/ffmpeg_core.c → cores/libretro-ffmpeg/ffmpeg_core.c
View File

@ -35,12 +35,11 @@ extern "C" {
#include <rthreads/rthreads.h> #include <rthreads/rthreads.h>
#include <queues/fifo_buffer.h> #include <queues/fifo_buffer.h>
#include "libretro.h"
#ifdef RARCH_INTERNAL #ifdef RARCH_INTERNAL
#include "internal_cores.h" #include "internal_cores.h"
#include "../libretro.h"
#define CORE_PREFIX(s) libretro_ffmpeg_##s #define CORE_PREFIX(s) libretro_ffmpeg_##s
#else #else
#include "libretro.h"
#define CORE_PREFIX(s) s #define CORE_PREFIX(s) s
#endif #endif

1
cores/libretro-ffmpeg/internal_cores.h Normal file
View File

@ -0,0 +1 @@
#include "../internal_cores.h"

1
cores/libretro-ffmpeg/libretro.h Normal file
View File

@ -0,0 +1 @@
#include "../../libretro.h"

5
cores/libretro-ffmpeg/link.T Normal file
View File

@ -0,0 +1,5 @@
{
global: retro_*;
local: *;
};

2
griffin/griffin.c
View File

@ -580,7 +580,7 @@ DYNAMIC
CORES CORES
============================================================ */ ============================================================ */
#ifdef HAVE_FFMPEG #ifdef HAVE_FFMPEG
#include "../cores/ffmpeg_core.c" #include "../cores/libretro-ffmpeg/ffmpeg_core.c"
#endif #endif
#include "../cores/dynamic_dummy.c" #include "../cores/dynamic_dummy.c"