[FFmpeg-cvslog] r26325 - trunk/libavfilter/avfilter.c

[stefano]

Author: stefano
Date: Thu Jan 13 02:00:36 2011
New Revision: 26325

Log:
Check linked pads media type mismatch in avfilter_link().

Modified:
   trunk/libavfilter/avfilter.c

Modified: trunk/libavfilter/avfilter.c
==============================================================================
--- trunk/libavfilter/avfilter.c	Thu Jan 13 02:00:31 2011	(r26324)
+++ trunk/libavfilter/avfilter.c	Thu Jan 13 02:00:36 2011	(r26325)
@@ -107,6 +107,13 @@ int avfilter_link(AVFilterContext *src, 
         src->outputs[srcpad]        || dst->inputs[dstpad])
         return -1;
 
+    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);
+        return AVERROR(EINVAL);
+    }
+
     src->outputs[srcpad] =
     dst-> inputs[dstpad] = link = av_mallocz(sizeof(AVFilterLink));