From bcb8d9eb8ff6e8f1e4c02d0143407373cffdbdeb Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Mon, 31 Dec 2012 00:29:36 +0100 Subject: [PATCH] Drop unnecessary 'l' length modifier when printfing double values. %f denotes a double argument and 'l' does nothing in this case according to the C spec. --- libavfilter/vf_frei0r.c | 2 +- libavfilter/vf_hqdn3d.c | 2 +- libavfilter/vsrc_movie.c | 2 +- libavutil/opt.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavfilter/vf_frei0r.c b/libavfilter/vf_frei0r.c index fd053906ce..955d0b9f83 100644 --- a/libavfilter/vf_frei0r.c +++ b/libavfilter/vf_frei0r.c @@ -189,7 +189,7 @@ static int set_params(AVFilterContext *ctx, const char *params) case F0R_PARAM_POSITION: v = &pos; frei0r->get_param_value(frei0r->instance, v, i); - av_log(ctx, AV_LOG_DEBUG, "%lf/%lf", pos.x, pos.y); + av_log(ctx, AV_LOG_DEBUG, "%f/%f", pos.x, pos.y); break; default: /* F0R_PARAM_STRING */ v = s; diff --git a/libavfilter/vf_hqdn3d.c b/libavfilter/vf_hqdn3d.c index 7365b8d502..085900fbce 100644 --- a/libavfilter/vf_hqdn3d.c +++ b/libavfilter/vf_hqdn3d.c @@ -236,7 +236,7 @@ static int init(AVFilterContext *ctx, const char *args) hqdn3d->strength[2] = chrom_spac; hqdn3d->strength[3] = chrom_tmp; - av_log(ctx, AV_LOG_VERBOSE, "ls:%lf cs:%lf lt:%lf ct:%lf\n", + av_log(ctx, AV_LOG_VERBOSE, "ls:%f cs:%f lt:%f ct:%f\n", lum_spac, chrom_spac, lum_tmp, chrom_tmp); if (lum_spac < 0 || chrom_spac < 0 || isnan(chrom_tmp)) { av_log(ctx, AV_LOG_ERROR, diff --git a/libavfilter/vsrc_movie.c b/libavfilter/vsrc_movie.c index e6185d686e..0023d55bbc 100644 --- a/libavfilter/vsrc_movie.c +++ b/libavfilter/vsrc_movie.c @@ -255,7 +255,7 @@ static int movie_get_frame(AVFilterLink *outlink) if (!movie->frame->sample_aspect_ratio.num) movie->picref->video->pixel_aspect = st->sample_aspect_ratio; av_dlog(outlink->src, - "movie_get_frame(): file:'%s' pts:%"PRId64" time:%lf pos:%"PRId64" aspect:%d/%d\n", + "movie_get_frame(): file:'%s' pts:%"PRId64" time:%f pos:%"PRId64" aspect:%d/%d\n", movie->file_name, movie->picref->pts, (double)movie->picref->pts * av_q2d(st->time_base), movie->picref->pos, diff --git a/libavutil/opt.c b/libavutil/opt.c index 8a98a9ef55..04f441338d 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -62,7 +62,7 @@ static int read_number(const AVOption *o, void *dst, double *num, int *den, int6 static int write_number(void *obj, const AVOption *o, void *dst, double num, int den, int64_t intnum) { if (o->max*den < num*intnum || o->min*den > num*intnum) { - av_log(obj, AV_LOG_ERROR, "Value %lf for parameter '%s' out of range\n", + av_log(obj, AV_LOG_ERROR, "Value %f for parameter '%s' out of range\n", num*intnum/den, o->name); return AVERROR(ERANGE); }