[FFmpeg-cvslog] avfilter/formats: fix wrong function name in error message
Jun Zhao
git at videolan.org
Tue Jan 9 02:28:34 EET 2018
ffmpeg | branch: release/3.2 | Jun Zhao <jun.zhao at intel.com> | Mon Dec 4 12:50:34 2017 +0800| [1a6f38b31b235a2ba9bf188ec0f52f76a090c7a5] | committer: Michael Niedermayer
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 at intel.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 4280948702bc256e21c375790b889c735d233b0d)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1a6f38b31b235a2ba9bf188ec0f52f76a090c7a5
---
libavfilter/formats.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavfilter/formats.c b/libavfilter/formats.c
index 20f45e33cc..2323017aad 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; \
More information about the ffmpeg-cvslog
mailing list