videoaggregator: don't create converters when the subclass doesn't want them
authorMatthew Waters <matthew@centricular.com>
Sun, 28 Sep 2014 06:58:42 +0000 (16:58 +1000)
committerMatthew Waters <matthew@centricular.com>
Sun, 28 Sep 2014 06:58:42 +0000 (16:58 +1000)
fixes a critical with glvideomixer after
35bd1969f912cecda0fb5df9595a005e6ddf4e7a

CRITICAL **: gst_video_converter_new: assertion 'in_info->width == out_info->width' failed

gst-libs/gst/video/gstvideoaggregator.c

index a09ff95..069cf78 100644 (file)
@@ -409,9 +409,14 @@ gst_videoaggregator_update_converters (GstVideoAggregator * vagg)
     return FALSE;
   }
 
+  vagg->info = best_info;
+
+  /* short circuit */
+  if (vagg_klass->disable_frame_conversion)
+    return TRUE;
+
   best_colorimetry = gst_video_colorimetry_to_string (&(best_info.colorimetry));
   best_chroma = gst_video_chroma_to_string (best_info.chroma_site);
-  vagg->info = best_info;
 
   GST_DEBUG_OBJECT (vagg,
       "The output format will now be : %d with colorimetry : %s and chroma : %s",