ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make ffmpeg core compile separately again and silence a couple of unused variable warnings (#15108)

This commit is contained in:
hunterk 2023-03-18 20:38:18 -05:00 committed by GitHub
parent ca11479f2f
commit 2a36245e0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cores/libretro-ffmpeg/Makefile
View File

@ -217,7 +217,7 @@ else
CFLAGS += -O3 CFLAGS += -O3
endif endif
OBJECTS := $(SOURCES_C:.c=.o) $(SOURCES_CXX:.cpp=.o) OBJECTS := $(SOURCES_C:.c=.o) $(SOURCES_CXX:.cpp=.o) ../../libretro-common/features/features_cpu.o
all: $(TARGET) all: $(TARGET)

2
cores/libretro-ffmpeg/Makefile.common
View File

@ -8,7 +8,7 @@ GL_SOURCE :=
CPUOPTS := CPUOPTS :=
DEPS_DIR := $(CORE_DIR)/deps DEPS_DIR := $(CORE_DIR)/deps
LIBRETRO_COMM_DIR := $(CORE_DIR)/libretro-common LIBRETRO_COMM_DIR := $(CORE_DIR)/../../libretro-common
BASE_DIR := $(CORE_DIR)/.. BASE_DIR := $(CORE_DIR)/..
AVFORMAT_DIR := $(BASE_DIR)/libavformat AVFORMAT_DIR := $(BASE_DIR)/libavformat
AVCODEC_DIR := $(BASE_DIR)/libavcodec AVCODEC_DIR := $(BASE_DIR)/libavcodec

1
cores/libretro-ffmpeg/ffmpeg_core.c
View File

@ -1060,7 +1060,6 @@ exit:
static enum AVPixelFormat auto_hw_decoder(AVCodecContext *ctx, static enum AVPixelFormat auto_hw_decoder(AVCodecContext *ctx,
const enum AVPixelFormat *pix_fmts) const enum AVPixelFormat *pix_fmts)
{ {
int ret = 0;
enum AVPixelFormat decoder_pix_fmt = AV_PIX_FMT_NONE; enum AVPixelFormat decoder_pix_fmt = AV_PIX_FMT_NONE;
enum AVHWDeviceType type = AV_HWDEVICE_TYPE_NONE; enum AVHWDeviceType type = AV_HWDEVICE_TYPE_NONE;

1
libretro-common/features/features_cpu.c
View File

@ -694,7 +694,6 @@ uint64_t cpu_features_get(void)
int flags[4]; int flags[4];
int vendor_shuffle[3]; int vendor_shuffle[3];
char vendor[13]; char vendor[13];
uint64_t cpu_flags = 0;
x86_cpuid(0, flags); x86_cpuid(0, flags);
vendor_shuffle[0] = flags[1]; vendor_shuffle[0] = flags[1];
vendor_shuffle[1] = flags[3]; vendor_shuffle[1] = flags[3];