diff options
Diffstat (limited to 'libavformat/avisynth.c')
| -rw-r--r-- | libavformat/avisynth.c | 48 |
1 files changed, 18 insertions, 30 deletions
diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c index f94f7b786d..c01d7e484c 100644 --- a/libavformat/avisynth.c +++ b/libavformat/avisynth.c @@ -2,20 +2,19 @@ * AviSynth/AvxSynth support * Copyright (c) 2012 AvxSynth Team. * - * This file is part of Libav. - * - * Libav is free software; you can redistribute it and/or + * This file is part of FFmpeg + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -27,25 +26,17 @@ /* Enable function pointer definitions for runtime loading. */ #define AVSC_NO_DECLSPEC -/* Platform-specific directives for AviSynth vs AvxSynth. - * - * avisynth_c.h needs to be the one provided with x264, as - * the one in AviSynth's CVS hasn't been updated to support - * 2.6's extra colorspaces. A temporary source of that header, - * installable from a GNU-style Makefile is available from - * github.com/qyot27/avisynth_headers -- AvxSynth doesn't - * require this kind of special treatment because like any - * standard *nix application, it installs its headers - * alongside its libs. */ +/* Platform-specific directives for AviSynth vs AvxSynth. */ #ifdef _WIN32 #include <windows.h> #undef EXTERN_C - #include <avisynth/avisynth_c.h> + #include "compat/avisynth/avisynth_c.h" + #include "compat/avisynth/avisynth_c_25.h" #define AVISYNTH_LIB "avisynth" #define USING_AVISYNTH #else #include <dlfcn.h> - #include <avxsynth/avxsynth_c.h> + #include "compat/avisynth/avxsynth_c.h" #if defined (__APPLE__) #define AVISYNTH_LIB "libavxsynth.dylib" #else @@ -393,19 +384,6 @@ static int avisynth_open_file(AVFormatContext *s) avs->clip = avs_library.avs_take_clip(val, avs->env); avs->vi = avs_library.avs_get_video_info(avs->clip); -#ifdef USING_AVISYNTH - /* libav 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. */ - - if (avs_library.avs_get_version(avs->clip) == 3) { - av_log(s, AV_LOG_ERROR, - "AviSynth 2.5.8 not supported. Please upgrade to 2.6.\n"); - ret = AVERROR_UNKNOWN; - goto fail; - } -#endif - /* Release the AVS_Value as it will go out of scope. */ avs_library.avs_release_value(val); @@ -502,8 +480,18 @@ static int avisynth_read_packet_video(AVFormatContext *s, AVPacket *pkt, src_p = avs_get_read_ptr_p(frame, plane); pitch = avs_get_pitch_p(frame, plane); +#ifdef USING_AVISYNTH + if (avs_library.avs_get_version(avs->clip) == 3) { + rowsize = avs_get_row_size_p_25(frame, plane); + planeheight = avs_get_height_p_25(frame, plane); + } else { + rowsize = avs_get_row_size_p(frame, plane); + planeheight = avs_get_height_p(frame, plane); + } +#else rowsize = avs_get_row_size_p(frame, plane); planeheight = avs_get_height_p(frame, plane); +#endif /* Flip RGB video. */ if (avs_is_rgb24(avs->vi) || avs_is_rgb(avs->vi)) { |