[FFmpeg-cvslog] lavfi: display pad type with mismatch error message.

Nicolas George git at videolan.org
Sat Jun 23 13:42:02 CEST 2012


ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Sat Jun 23 11:34:46 2012 +0200| [bd9939f4951d9069d96b771e253f20534541aeb4] | committer: Nicolas George

lavfi: display pad type with mismatch error message.

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

 libavfilter/avfilter.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 5995cf6..0954ce0 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -126,8 +126,9 @@ int avfilter_link(AVFilterContext *src, unsigned srcpad,
 
     if (src->output_pads[srcpad].type != dst->input_pads[dstpad].type) {
         av_log(src, AV_LOG_ERROR,
-               "Media type mismatch between the '%s' filter output pad %d and the '%s' filter input pad %d\n",
-               src->name, srcpad, dst->name, dstpad);
+               "Media type mismatch between the '%s' filter output pad %d (%s) and the '%s' filter input pad %d (%s)\n",
+               src->name, srcpad, (char *)av_x_if_null(av_get_media_type_string(src->output_pads[srcpad].type), "?"),
+               dst->name, dstpad, (char *)av_x_if_null(av_get_media_type_string(dst-> input_pads[dstpad].type), "?"));
         return AVERROR(EINVAL);
     }
 



More information about the ffmpeg-cvslog mailing list