[FFmpeg-devel] [PATCH 4/4] Make config_props() show conversion information before to create a swscale context.
Stefano Sabatini
stefano.sabatini-lala
Fri May 7 18:11:43 CEST 2010
This makes eventual warnings issued in case of swscale context
creation failure to be shown after the conversion information,
which is slightly less confusing.
---
libavfilter/vf_scale.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c
index 4ba7e9f..ef5c3c3 100644
--- a/libavfilter/vf_scale.c
+++ b/libavfilter/vf_scale.c
@@ -128,10 +128,6 @@ static int config_props(AVFilterLink *outlink)
outlink->h = h;
/* TODO: make algorithm configurable */
- scale->sws = sws_getContext(inlink ->w, inlink ->h, inlink ->format,
- outlink->w, outlink->h, outlink->format,
- scale->flags, NULL, NULL, NULL);
-
av_log(ctx, AV_LOG_INFO, "w:%d h:%d fmt:%s -> w:%d h:%d fmt:%s flags:%0x\n",
inlink ->w, inlink ->h, av_pix_fmt_descriptors[ inlink->format].name,
outlink->w, outlink->h, av_pix_fmt_descriptors[outlink->format].name,
@@ -139,6 +135,10 @@ static int config_props(AVFilterLink *outlink)
scale->input_is_pal = av_pix_fmt_descriptors[inlink->format].flags & PIX_FMT_PAL;
+ scale->sws = sws_getContext(inlink ->w, inlink ->h, inlink ->format,
+ outlink->w, outlink->h, outlink->format,
+ scale->flags, NULL, NULL, NULL);
+
return !scale->sws;
}
--
1.7.0
More information about the ffmpeg-devel
mailing list