Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: Compiling under windows

Browse source 
--HG--
branch : develop
This commit is contained in:
Nimetu 2018-11-04 15:59:42 +02:00
parent cea7a4c0cb
commit 19e1b47ddb
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/src/sound/CMakeLists.txt
View file

@ -3,7 +3,7 @@ FILE(GLOB HEADERS ../../include/nel/sound/*.h)
IF(NOT FFMPEG_FOUND) IF(NOT FFMPEG_FOUND)
LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/audio_decoder_ffmpeg.cpp) LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/audio_decoder_ffmpeg.cpp)
LIST(REMOVE_ITEM HEADERS ${CMAKE_CURRENT_SOURCE_DIR}../../include/nel/sound/audio_decoder_ffmpeg.h) LIST(REMOVE_ITEM HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/../../include/nel/sound/audio_decoder_ffmpeg.h)
ENDIF() ENDIF()
FILE(GLOB ANIMATION FILE(GLOB ANIMATION

7
code/nel/src/sound/audio_decoder_ffmpeg.cpp
View file

@ -26,10 +26,15 @@ extern "C"
#include <libavformat/avformat.h> #include <libavformat/avformat.h>
#include <libswresample/swresample.h> #include <libswresample/swresample.h>
#include <libavutil/opt.h> #include <libavutil/opt.h>
}; }
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;
using namespace NLSOUND;
// Visual Studio does not support AV_TIME_BASE_Q macro in C++
#undef AV_TIME_BASE_Q
static const AVRational AV_TIME_BASE_Q = {1, AV_TIME_BASE};
namespace { namespace {