From 14e0a518768310e9dbb0b4fa3d07d81dbecf1be7 Mon Sep 17 00:00:00 2001
From: Amar Takhar <verm@aegisub.org>
Date: Wed, 10 Jun 2009 02:21:20 +0000
Subject: [PATCH] Remove support for old FFMPEG releases, if you require or
 want this support you are officially on your own, closes #875.

Originally committed to SVN as r3039.
---
 aegisub/configure.in              | 5 -----
 aegisub/src/audio_provider_lavc.h | 5 -----
 aegisub/src/lavc_file.h           | 5 -----
 aegisub/src/video_provider_lavc.h | 6 ------
 4 files changed, 21 deletions(-)

diff --git a/aegisub/configure.in b/aegisub/configure.in
index de8dd9122..8855e25b4 100644
--- a/aegisub/configure.in
+++ b/aegisub/configure.in
@@ -618,11 +618,6 @@ AM_CONDITIONAL([HAVE_OPENAL], [test "$with_openal" != "no"])
 # Video / Audio Providers
 #########################
 
-AC_ARG_ENABLE(old-ffmpeg, [  --enable-old-ffmpeg     Use old FFMPEG header locations (default=no)])
-if test "$enable_old_ffmpeg" = "yes"; then
-  AC_DEFINE([WITH_OLD_FFMPEG], [1], [Use old FFMPEG header locations])
-fi
-
 AC_ARG_WITH(ffmpeg, [  --without-ffmpeg        build without FFMPEG support.
                           Disables FFMPEG and FFmpegSource A/V providers.
                           (default: auto)], [ffmpeg_disabled="(disabled)"; with_ffmpeg="no"])
diff --git a/aegisub/src/audio_provider_lavc.h b/aegisub/src/audio_provider_lavc.h
index 4ea3c924b..ae5f01a21 100644
--- a/aegisub/src/audio_provider_lavc.h
+++ b/aegisub/src/audio_provider_lavc.h
@@ -52,13 +52,8 @@
  */
 
 extern "C" {
-#ifdef WITH_OLD_FFMPEG
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/avformat.h>
-#else
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
-#endif /* WITH_OLD_FFMPEG */
 }
 #include "mkv_wrap.h"
 #include "lavc_file.h"
diff --git a/aegisub/src/lavc_file.h b/aegisub/src/lavc_file.h
index b53891d83..155421943 100644
--- a/aegisub/src/lavc_file.h
+++ b/aegisub/src/lavc_file.h
@@ -41,13 +41,8 @@
 #endif
 #include <wx/filename.h>
 extern "C" {
-#ifdef WITH_OLD_FFMPEG
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/avformat.h>
-#else
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
-#endif /* WITH_OLD_FFMPEG */
 }
 #include "include/aegisub/aegisub.h"
 
diff --git a/aegisub/src/video_provider_lavc.h b/aegisub/src/video_provider_lavc.h
index 56e328f4a..fd6f7369a 100644
--- a/aegisub/src/video_provider_lavc.h
+++ b/aegisub/src/video_provider_lavc.h
@@ -44,15 +44,9 @@
 #endif
 #include <vector>
 extern "C" {
-#ifdef WITH_OLD_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_OLD_FFMPEG */
 }
 #include "include/aegisub/video_provider.h"
 #include "include/aegisub/aegisub.h"