From 336be81bef86244a28b378b4c143ad8924c9e2d9 Mon Sep 17 00:00:00 2001
From: Jun Zhao <jun.z...@intel.com>
Date: Mon, 4 Dec 2017 12:50:34 +0800
Subject: [PATCH] avfilter/formats: fix wrong function name in error message
Use perdefined micro __FUNCTION__ rather than hard coding function name
to fix wrong function name in error message.
Signed-off-by: Jun Zhao <jun.z...@intel.com>
---
libavfilter/formats.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavfilter/formats.c b/libavfilter/formats.c
index d4de862237..20a2c89719 100644
--- a/libavfilter/formats.c
+++ b/libavfilter/formats.c
@@ -72,7 +72,7 @@ do {
for (j = 0; j < b->nb; j++)
\
if (a->fmts[i] == b->fmts[j]) {
\
if(k >= FFMIN(a->nb, b->nb)){
\
- av_log(NULL, AV_LOG_ERROR, "Duplicate formats in
avfilter_merge_formats() detected\n"); \
+ av_log(NULL, AV_LOG_ERROR, "Duplicate formats in %s
detected\n", __FUNCTION__); \
av_free(ret->fmts);
\
av_free(ret);
\
return NULL;
\
--
2.14.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
