[FFmpeg-cvslog] lavfi/scale: avoid to print a NULL value in log message

Stefano Sabatini git at videolan.org
Wed Oct 31 15:47:58 CET 2012


ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Wed Oct 31 15:45:28 2012 +0100| [1b216421494f4a34be29804ba088b983a2dc98e1] | committer: Stefano Sabatini

lavfi/scale: avoid to print a NULL value in log message

Fix possible crash occurring when libc does not support NULL printing.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1b216421494f4a34be29804ba088b983a2dc98e1
---

 libavfilter/vf_scale.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c
index 82a777c..b259799 100644
--- a/libavfilter/vf_scale.c
+++ b/libavfilter/vf_scale.c
@@ -153,8 +153,8 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
     if (!scale->h_expr)
         av_opt_set(scale, "h", "ih", 0);
 
-    av_log(ctx, AV_LOG_VERBOSE, "w:%s h:%s flags:%s interl:%d\n",
-           scale->w_expr, scale->h_expr, scale->flags_str, scale->interlaced);
+    av_log(ctx, AV_LOG_VERBOSE, "w:%s h:%s flags:'%s' interl:%d\n",
+           scale->w_expr, scale->h_expr, (char *)av_x_if_null(scale->flags_str, ""), scale->interlaced);
 
     scale->flags = SWS_BILINEAR;
     if (scale->flags_str) {



More information about the ffmpeg-cvslog mailing list