diff --git a/Makefile.common b/Makefile.common index 3adbecfab3..6d81b6113f 100644 --- a/Makefile.common +++ b/Makefile.common @@ -2238,9 +2238,10 @@ ifeq ($(HAVE_FFMPEG), 1) cores/libretro-ffmpeg/ffmpeg_core.o \ cores/libretro-ffmpeg/packet_buffer.o \ cores/libretro-ffmpeg/video_buffer.o \ - $(LIBRETRO_COMM_DIR)/rthreads/tpool.o + $(LIBRETRO_COMM_DIR)/rthreads/tpool.o \ + camera/drivers/ffmpeg.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) $(AVDEVICE_LIBS) DEFINES += -DHAVE_FFMPEG DEF_FLAGS += $(AVCODEC_CFLAGS) $(AVFORMAT_CFLAGS) $(AVUTIL_CFLAGS) $(SWSCALE_CFLAGS) $(SWRESAMPLE_CFLAGS) \ -Wno-deprecated-declarations diff --git a/Makefile.win b/Makefile.win index fcffc10ad9..e7c890d9e1 100644 --- a/Makefile.win +++ b/Makefile.win @@ -89,6 +89,7 @@ AVUTIL_LIBS := -lavutil SWSCALE_LIBS := -lswscale AVFORMAT_LIBS := -lavformat SWRESAMPLE_LIBS := -lswresample +AVDEVICE_LIBS := -lavdevice FFMPEG_LIBS := -lws2_32 -lz endif diff --git a/camera/drivers/ffmpeg.c b/camera/drivers/ffmpeg.c new file mode 100644 index 0000000000..2a7a27c978 --- /dev/null +++ b/camera/drivers/ffmpeg.c @@ -0,0 +1,20 @@ +/* RetroArch - A frontend for libretro. +* Copyright (C) 2010-2023 - Hans-Kristian Arntzen +* Copyright (C) 2023 - Jesse Talavera-Greenberg +* +* RetroArch is free software: you can redistribute it and/or modify it under the terms +* of the GNU General Public License as published by the Free Software Found- +* ation, either version 3 of the License, or (at your option) any later version. +* +* RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; +* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +* PURPOSE. See the GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License along with RetroArch. +* If not, see . +*/ + +#include + +#include "../camera_driver.h" +#include "../../retroarch.h"