diff options
| author | Stephen Hutchinson <qyot27@gmail.com> | 2015-04-02 15:39:25 -0400 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2015-04-14 13:52:41 +0200 |
| commit | a6a45e5a9a9dfb725456f62e053532e505aadcfc (patch) | |
| tree | 8273d9a83af9e2a40eaa7e4a44765121be7bd35d | |
| parent | 13e4f2c7f7857feb6885f0c2ea8c9ddf438f46ea (diff) | |
| download | ffmpeg-a6a45e5a9a9dfb725456f62e053532e505aadcfc.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: Diego Biurrun <diego@biurrun.de>
| -rw-r--r-- | libavformat/avisynth.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c index fb7441c6c7..a2f0550a3f 100644 --- a/libavformat/avisynth.c +++ b/libavformat/avisynth.c @@ -140,15 +140,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 |