Merge 8737bff2bfec303b4affd06be9f44acd4b13f34d into a9e8f2a1c9df7363710aa6213eca608c0bcc71ec

This commit is contained in:
Drew Parsons 2025-05-01 21:00:04 +00:00 committed by GitHub
commit d32da3f3e6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 0 deletions

View File

@ -439,6 +439,9 @@ if (USE_MPEG)
find_package(FFMPEG REQUIRED)
add_definitions(-DFFMPEG -D__STDC_CONSTANT_MACROS)
include_directories(${FFMPEG_INCLUDE_DIR})
if(USE_GUI)
target_link_libraries(nggui INTERFACE ${FFMPEG_LIBRARIES})
endif(USE_GUI)
endif (USE_MPEG)
#######################################################################

View File

@ -3,6 +3,9 @@
#ifdef FFMPEG
#include <mystdlib.h>
using namespace std;
extern "C" {
#include <libavutil/avassert.h>
#include <libavcodec/avcodec.h>