summaryrefslogtreecommitdiff
path: root/libavformat/avisynth.c
diff options
context:
space:
mode:
authorStephen Hutchinson <qyot27@gmail.com>2015-04-02 15:38:53 -0400
committerMichael Niedermayer <michaelni@gmx.at>2015-04-02 23:30:08 +0200
commitd858c3a18f193a54fb083223f1a7fa0470ddfac6 (patch)
treeaf14c5c89a4201d4280df35bd5998622436ff6f6 /libavformat/avisynth.c
parent30001837324804855ee32ff79375502186ab9bc9 (diff)
downloadffmpeg-d858c3a18f193a54fb083223f1a7fa0470ddfac6.tar.gz
avisynth: Fix detection of AviSynth 2.5
In order to safely exit when the user tries to use AviSynth 2.5, the continue_on_fail value for 2.6's functions need to be set to 1. Otherwise, the library loader fails before the 'upgrade to 2.6' log message appears. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avisynth.c')
-rw-r--r--libavformat/avisynth.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c
index 7b3f2c6ded..84b7d046fa 100644
--- a/libavformat/avisynth.c
+++ b/libavformat/avisynth.c
@@ -139,15 +139,15 @@ static av_cold int avisynth_load_library(void)
LOAD_AVS_FUNC(avs_release_video_frame, 0);
LOAD_AVS_FUNC(avs_take_clip, 0);
#ifdef USING_AVISYNTH
- LOAD_AVS_FUNC(avs_bits_per_pixel, 0);
- LOAD_AVS_FUNC(avs_get_height_p, 0);
- LOAD_AVS_FUNC(avs_get_pitch_p, 0);
- LOAD_AVS_FUNC(avs_get_read_ptr_p, 0);
- LOAD_AVS_FUNC(avs_get_row_size_p, 0);
- LOAD_AVS_FUNC(avs_is_yv24, 0);
- LOAD_AVS_FUNC(avs_is_yv16, 0);
- LOAD_AVS_FUNC(avs_is_yv411, 0);
- LOAD_AVS_FUNC(avs_is_y8, 0);
+ LOAD_AVS_FUNC(avs_bits_per_pixel, 1);
+ LOAD_AVS_FUNC(avs_get_height_p, 1);
+ LOAD_AVS_FUNC(avs_get_pitch_p, 1);
+ LOAD_AVS_FUNC(avs_get_read_ptr_p, 1);
+ LOAD_AVS_FUNC(avs_get_row_size_p, 1);
+ LOAD_AVS_FUNC(avs_is_yv24, 1);
+ LOAD_AVS_FUNC(avs_is_yv16, 1);
+ LOAD_AVS_FUNC(avs_is_yv411, 1);
+ LOAD_AVS_FUNC(avs_is_y8, 1);
#endif
#undef LOAD_AVS_FUNC