Fix avisynth_context_create constructor error handling.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
d s 2013-03-26 19:36:18 -07:00 committed by Michael Niedermayer
parent 92a9a3020d
commit 444001bda6

View File

@ -164,8 +164,14 @@ static av_cold int avisynth_context_create(AVFormatContext *s) {
return ret;
}
if (!avs)
return AVERROR_UNKNOWN;
avs->env = avs_library->avs_create_script_environment(3);
if (avs_library->avs_get_error) {
const char *error = avs_library->avs_get_error(avs->env);
if (error) {
av_log(s, AV_LOG_ERROR, "%s\n", error);
return AVERROR_UNKNOWN;
}
}
if (!avs_ctx_list) {
avs_ctx_list = avs;
@ -174,16 +180,6 @@ static av_cold int avisynth_context_create(AVFormatContext *s) {
avs_ctx_list = avs;
}
avs->env = avs_library->avs_create_script_environment(3);
if (avs_library->avs_get_error) {
const char *error = avs_library->avs_get_error(avs->env);
if (error) {
av_log(s, AV_LOG_ERROR, "%s\n", error);
av_free(avs);
return AVERROR_UNKNOWN;
}
}
return 0;
}