From 00265d6ec43f456fee8286b16a18b3b928f59ab9 Mon Sep 17 00:00:00 2001
From: Karl Blomster <kalle.blomster@gmail.com>
Date: Sun, 28 Sep 2008 13:02:25 +0000
Subject: [PATCH] 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 | 5 +++++
 aegisub/lavc_file.h           | 5 +++++
 aegisub/video_provider_lavc.h | 6 ++++++
 3 files changed, 16 insertions(+)

diff --git a/aegisub/audio_provider_lavc.h b/aegisub/audio_provider_lavc.h
index 4f71cb425..c7ef363f3 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 21e8ab8ca..eee266aea 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 96cff5260..875a8e189 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"