iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

change the ffmpeg includes to libav*/*.h for good this time, but you can still define WITH_OLD_FFMPEG to get the old includes. 

Originally committed to SVN as r2398.
This commit is contained in:
Karl Blomster 2008-09-28 13:02:25 +00:00
parent dde0214246
commit 00265d6ec4
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
aegisub/audio_provider_lavc.h
View File

@ -52,8 +52,13 @@
*/ */
extern "C" { extern "C" {
#ifdef WITH_ANCIENT_FFMPEG
#include <ffmpeg/avcodec.h> #include <ffmpeg/avcodec.h>
#include <ffmpeg/avformat.h> #include <ffmpeg/avformat.h>
#else
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
#endif /* WITH_ANCIENT_FFMPEG */
} }
#include "mkv_wrap.h" #include "mkv_wrap.h"
#include "lavc_file.h" #include "lavc_file.h"

5
aegisub/lavc_file.h
View File

@ -41,8 +41,13 @@
#endif #endif
#include <wx/filename.h> #include <wx/filename.h>
extern "C" { extern "C" {
#ifdef WITH_ANCIENT_FFMPEG
#include <ffmpeg/avcodec.h> #include <ffmpeg/avcodec.h>
#include <ffmpeg/avformat.h> #include <ffmpeg/avformat.h>
#else
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
#endif /* WITH_ANCIENT_FFMPEG */
} }
#include "include/aegisub/aegisub.h" #include "include/aegisub/aegisub.h"

6
aegisub/video_provider_lavc.h
View File

@ -44,9 +44,15 @@
#endif #endif
#include <vector> #include <vector>
extern "C" { extern "C" {
#ifdef WITH_ANCIENT_FFMPEG
#include <ffmpeg/avcodec.h> #include <ffmpeg/avcodec.h>
#include <ffmpeg/avformat.h> #include <ffmpeg/avformat.h>
#include <ffmpeg/swscale.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/video_provider.h"
#include "include/aegisub/aegisub.h" #include "include/aegisub/aegisub.h"