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

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.

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"

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"
 

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"