diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2012-10-15 09:21:15 +0200 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2012-10-29 17:39:26 +0100 |
| commit | c2428ada71af5491b0f82bf4ad9825a630c0a753 (patch) | |
| tree | 9e51208fded62adb1385984aefb713ed5e2c6e54 | |
| parent | 83938c3d4cb7c2ad4ecaf2dc890b7d366ea85a8b (diff) | |
| download | ffmpeg-c2428ada71af5491b0f82bf4ad9825a630c0a753.tar.gz | |
lavfi/scale: return error code in case of failed reconfiguration in start_frame()
Avoid an assert, since now the function supports error code return.
| -rw-r--r-- | libavfilter/vf_scale.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index 1a4784dde5..5c6751bcf1 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -316,10 +316,9 @@ static int start_frame(AVFilterLink *link, AVFilterBufferRef *picref) link->dst->inputs[0]->h = picref->video->h; if ((ret = config_props(outlink)) < 0) - av_assert0(0); //what to do here ? + return ret; } - if (!scale->sws) { outpicref = avfilter_ref_buffer(picref, ~0); if (!outpicref) |