diff --git a/aegisub/audio_provider_lavc.h b/aegisub/audio_provider_lavc.h index 4f71cb425a9d4a8b2486e038568170e6b759dd0a..c7ef363f3bd5ab6c0632f672def7a9cf4a3ad0ef 100644 --- a/aegisub/audio_provider_lavc.h +++ b/aegisub/audio_provider_lavc.h @@ -52,8 +52,13 @@ */ extern "C" { +#ifdef WITH_ANCIENT_FFMPEG #include <ffmpeg/avcodec.h> #include <ffmpeg/avformat.h> +#else +#include <libavcodec/avcodec.h> +#include <libavformat/avformat.h> +#endif /* WITH_ANCIENT_FFMPEG */ } #include "mkv_wrap.h" #include "lavc_file.h" diff --git a/aegisub/lavc_file.h b/aegisub/lavc_file.h index 21e8ab8cac4eae0595be91a3cfe336d5b6cdb11b..eee266aeaae333ed6fa246bb288e5c98621ecff0 100644 --- a/aegisub/lavc_file.h +++ b/aegisub/lavc_file.h @@ -41,8 +41,13 @@ #endif #include <wx/filename.h> extern "C" { +#ifdef WITH_ANCIENT_FFMPEG #include <ffmpeg/avcodec.h> #include <ffmpeg/avformat.h> +#else +#include <libavcodec/avcodec.h> +#include <libavformat/avformat.h> +#endif /* WITH_ANCIENT_FFMPEG */ } #include "include/aegisub/aegisub.h" diff --git a/aegisub/video_provider_lavc.h b/aegisub/video_provider_lavc.h index 96cff5260169959551b6aa927d6bffd9d6731675..875a8e189517ebd3d9928805d58589411efe4c9a 100644 --- a/aegisub/video_provider_lavc.h +++ b/aegisub/video_provider_lavc.h @@ -44,9 +44,15 @@ #endif #include <vector> extern "C" { +#ifdef WITH_ANCIENT_FFMPEG #include <ffmpeg/avcodec.h> #include <ffmpeg/avformat.h> #include <ffmpeg/swscale.h> +#else +#include <libavcodec/avcodec.h> +#include <libavformat/avformat.h> +#include <libswscale/swscale.h> +#endif /* WITH_ANCIENT_FFMPEG */ } #include "include/aegisub/video_provider.h" #include "include/aegisub/aegisub.h"