summaryrefslogtreecommitdiff
path: root/libavformat/avisynth.c
diff options
context:
space:
mode:
authorStephen Hutchinson <qyot27@gmail.com>2015-04-02 15:38:54 -0400
committerMichael Niedermayer <michaelni@gmx.at>2015-04-02 23:52:48 +0200
commit3723a183103718352b37ec2617f71e96ee2c3846 (patch)
tree866c730c36b315a4fc017ea09e0339fe75cd5f2e /libavformat/avisynth.c
parentd858c3a18f193a54fb083223f1a7fa0470ddfac6 (diff)
avisynth: Bump minimum required version to interface version 6
The AVSC_API changes in the new headers mean that the 2.6 alphas are just as incompatible as 2.5 is. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avisynth.c')
-rw-r--r--libavformat/avisynth.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c
index 84b7d046fa..4af58f62f7 100644
--- a/libavformat/avisynth.c
+++ b/libavformat/avisynth.c
@@ -406,13 +406,14 @@ static int avisynth_open_file(AVFormatContext *s)
avs->vi = avs_library.avs_get_video_info(avs->clip);
#ifdef USING_AVISYNTH
- /* FFmpeg only supports AviSynth 2.6 on Windows. Since AvxSynth
- * identifies itself as interface version 3 like 2.5.8, this
- * needs to be special-cased. */
+ /* On Windows, FFmpeg supports AviSynth interface version 6 or higher.
+ * This includes AviSynth 2.6 RC1 or higher, and AviSynth+ r1718 or higher,
+ * and excludes 2.5 and the 2.6 alphas. Since AvxSynth identifies itself
+ * as interface version 3 like 2.5.8, this needs to be special-cased. */
- if (avs_library.avs_get_version(avs->clip) == 3) {
+ if (avs_library.avs_get_version(avs->clip) < 6) {
av_log(s, AV_LOG_ERROR,
- "AviSynth 2.5.8 not supported. Please upgrade to 2.6.\n");
+ "AviSynth version is too old. Please upgrade to either AviSynth 2.6 >= RC1 or AviSynth+ >= r1718.\n");
ret = AVERROR_UNKNOWN;
goto fail;
}