[FFmpeg-cvslog] lavfi/amerge: silence warnings

Paul B Mahol git at videolan.org
Thu Jun 28 19:19:00 CEST 2012


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Thu Jun 28 16:51:17 2012 +0000| [3f59bbf5b62710e23243597f3ec6e4c69425657e] | committer: Paul B Mahol

lavfi/amerge: silence warnings

The warning silenced was: libavfilter/af_amerge.c:144:29: warning: conversion specifies type 'long long' but the argument has type 'int' [-Wformat]

The warning was introduced after FF_API_SAMPLERATE64 removal.

Signed-off-by: Paul B Mahol <onemda at gmail.com>

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

 libavfilter/af_amerge.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c
index 429057c..802188d 100644
--- a/libavfilter/af_amerge.c
+++ b/libavfilter/af_amerge.c
@@ -141,7 +141,7 @@ static int config_output(AVFilterLink *outlink)
         if (ctx->inputs[i]->sample_rate != ctx->inputs[0]->sample_rate) {
             av_log(ctx, AV_LOG_ERROR,
                    "Inputs must have the same sample rate "
-                   "(%"PRIi64" for in%d vs %"PRIi64")\n",
+                   "%d for in%d vs %d\n",
                    ctx->inputs[i]->sample_rate, i, ctx->inputs[0]->sample_rate);
             return AVERROR(EINVAL);
         }



More information about the ffmpeg-cvslog mailing list