From a90d855950b0ac04179b45b68e1d827e4c67b97e Mon Sep 17 00:00:00 2001
From: Karl Blomster <kalle.blomster@gmail.com>
Date: Sun, 9 Jan 2011 21:47:46 +0000
Subject: [PATCH] update ffms2 to r409

Originally committed to SVN as r5158.
---
 aegisub/libffms/src/core/utils.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/aegisub/libffms/src/core/utils.cpp b/aegisub/libffms/src/core/utils.cpp
index cc9cc97e8..248f92205 100644
--- a/aegisub/libffms/src/core/utils.cpp
+++ b/aegisub/libffms/src/core/utils.cpp
@@ -30,6 +30,10 @@
 #	include <fcntl.h>
 extern "C" {
 #	include "libavutil/avstring.h"
+	/* if you have this, we'll assume you have a new enough libavutil too */
+#	if LIBSWSCALE_VERSION_INT >= AV_VERSION_INT(0, 12, 0) 
+#		include <libavutil/opt.h>
+#	endif
 }
 #endif // _WIN32
 
@@ -45,8 +49,6 @@ extern const AVCodecTag ff_codec_bmp_tags[];
 extern const CodecTags ff_mkv_codec_tags[];
 extern const AVCodecTag ff_codec_movvideo_tags[];
 extern const AVCodecTag ff_codec_wav_tags[];
-
-#include <libavutil/opt.h>
 }
 
 extern int CPUFeatures;