diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-25 13:19:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-25 13:28:51 +0200 |
| commit | 0d96d44c4fa526582500718254ac9e19f984c6a5 (patch) | |
| tree | 876c479daab80ee280565eec68cee82761e8e042 | |
| parent | a63096953559ab40b09e125056d2a86bf6a354bb (diff) | |
| download | ffmpeg-0d96d44c4fa526582500718254ac9e19f984c6a5.tar.gz | |
avfilter: Read errno before av_log() as the callback from av_log() might affect errno
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavfilter/vf_vidstabdetect.c | 3 | ||||
| -rw-r--r-- | libavfilter/vf_vidstabtransform.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/libavfilter/vf_vidstabdetect.c b/libavfilter/vf_vidstabdetect.c index bf067afaf9..1df6f74f4e 100644 --- a/libavfilter/vf_vidstabdetect.c +++ b/libavfilter/vf_vidstabdetect.c @@ -176,8 +176,9 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) return AVERROR(AVERROR_EXTERNAL); } else { if (vsWriteToFile(md, sd->f, &localmotions) != VS_OK) { + int ret = AVERROR(errno); av_log(ctx, AV_LOG_ERROR, "cannot write to transform file"); - return AVERROR(errno); + return ret; } vs_vector_del(&localmotions); } diff --git a/libavfilter/vf_vidstabtransform.c b/libavfilter/vf_vidstabtransform.c index 1bd43ff7c9..9db6a46290 100644 --- a/libavfilter/vf_vidstabtransform.c +++ b/libavfilter/vf_vidstabtransform.c @@ -208,8 +208,9 @@ static int config_input(AVFilterLink *inlink) f = fopen(tc->input, "r"); if (!f) { + int ret = AVERROR(errno); av_log(ctx, AV_LOG_ERROR, "cannot open input file %s\n", tc->input); - return AVERROR(errno); + return ret; } else { VSManyLocalMotions mlms; if (vsReadLocalMotionsFile(f, &mlms) == VS_OK) { |