Commit 0d34e212 authored by Stephen Hutchinson's avatar Stephen Hutchinson

avformat/avisynth: fix frameprop version check

Trying to be clever about determining between interface version 8
and 8.1 ended up with pre-8.1 versions of AviSynth+ segfaulting.

The amount of time between interface version 8.1 and 9 is small,
so just restrict the frameprop awareness to version 9 and call it
a day.
Signed-off-by: 's avatarStephen Hutchinson <qyot27@gmail.com>
parent 3abb80f6
...@@ -19,8 +19,6 @@ ...@@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <stdbool.h>
#include "libavutil/attributes.h" #include "libavutil/attributes.h"
#include "libavutil/internal.h" #include "libavutil/internal.h"
...@@ -502,24 +500,13 @@ static int avisynth_create_stream_video(AVFormatContext *s, AVStream *st) ...@@ -502,24 +500,13 @@ static int avisynth_create_stream_video(AVFormatContext *s, AVStream *st)
/* Read AviSynth+'s frame properties to set additional info. /* Read AviSynth+'s frame properties to set additional info.
* *
* Due to a bug preventing the C interface from accessing frame * Due to a bug preventing the C interface from accessing frame
* properties in earlier versions of interface version 8, only * properties in earlier versions of interface version 8, and
* enable this if we detect version 8.1 at the minimum. */ * previous attempts at being clever resulting in pre-8 versions
* of AviSynth+ segfaulting, only enable this if we detect
if (!avs_library.avs_get_env_property) { * version 9 at the minimum. Technically, 8.1 works, but the time
av_log(s, AV_LOG_TRACE, "%s\n", * distance between 8.1 and 9 is very small, so just restrict it to 9. */
"avs_get_env_property does not exist in AviSynth library; frame properties won't be checked.");
frameprop = false;
} else {
if (avs_library.avs_get_env_property(avs->env, AVS_AEP_INTERFACE_BUGFIX)) {
av_log(s, AV_LOG_TRACE, "%s\n", "Using interface version 8.1 or higher, reading frame properties.");
frameprop = true;
} else {
av_log(s, AV_LOG_TRACE, "%s\n", "Using interface version 8.0, need 8.1+ to read frame properties.");
frameprop = false;
}
}
if (frameprop = true) { if (avs_library.avs_get_version(avs->clip) >= 9) {
frame = avs_library.avs_get_frame(avs->clip, framedata); frame = avs_library.avs_get_frame(avs->clip, framedata);
avsmap = avs_library.avs_get_frame_props_ro(avs->env, frame); avsmap = avs_library.avs_get_frame_props_ro(avs->env, frame);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment