aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJun Zhao <jun.zhao@intel.com>2017-12-04 12:50:34 +0800
committerMichael Niedermayer <michael@niedermayer.cc>2018-01-28 15:31:13 +0100
commit9aa0ed850b77fe46d5b766329f45deb9150cea10 (patch)
tree4426f3dbcbfcfe87ecc7d46e3dfdb580f22a7e55
parent93c8720b914e7027d0e6401e6f64a9a4ce531d0c (diff)
downloadffmpeg-9aa0ed850b77fe46d5b766329f45deb9150cea10.tar.gz
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.zhao@intel.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 4280948702bc256e21c375790b889c735d233b0d) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavfilter/formats.c2
1 files changed, 1 insertions, 1 deletions
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; \