mirror of
https://github.com/libretro/RetroArch.git
synced 2024-06-02 19:57:24 -04:00
make ffmpeg core compile separately again and silence a couple of unused variable warnings (#15108)
This commit is contained in:
parent
ca11479f2f
commit
2a36245e0c
|
@ -217,7 +217,7 @@ else
|
|||
CFLAGS += -O3
|
||||
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)
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@ GL_SOURCE :=
|
|||
|
||||
CPUOPTS :=
|
||||
DEPS_DIR := $(CORE_DIR)/deps
|
||||
LIBRETRO_COMM_DIR := $(CORE_DIR)/libretro-common
|
||||
LIBRETRO_COMM_DIR := $(CORE_DIR)/../../libretro-common
|
||||
BASE_DIR := $(CORE_DIR)/..
|
||||
AVFORMAT_DIR := $(BASE_DIR)/libavformat
|
||||
AVCODEC_DIR := $(BASE_DIR)/libavcodec
|
||||
|
|
|
@ -1060,7 +1060,6 @@ exit:
|
|||
static enum AVPixelFormat auto_hw_decoder(AVCodecContext *ctx,
|
||||
const enum AVPixelFormat *pix_fmts)
|
||||
{
|
||||
int ret = 0;
|
||||
enum AVPixelFormat decoder_pix_fmt = AV_PIX_FMT_NONE;
|
||||
enum AVHWDeviceType type = AV_HWDEVICE_TYPE_NONE;
|
||||
|
||||
|
|
|
@ -694,7 +694,6 @@ uint64_t cpu_features_get(void)
|
|||
int flags[4];
|
||||
int vendor_shuffle[3];
|
||||
char vendor[13];
|
||||
uint64_t cpu_flags = 0;
|
||||
x86_cpuid(0, flags);
|
||||
vendor_shuffle[0] = flags[1];
|
||||
vendor_shuffle[1] = flags[3];
|
||||
|
|
Loading…
Reference in a new issue