commit 3e93ce67e570ed5cee3b37bef66013421f0b9619
author Nicolas Dufresne <nicolas.dufresne@collabora.com> Mon Jul 09 13:59:02 2018 -0400
committer Nicolas Dufresne <nicolas.dufresne@collabora.com> Mon Jul 09 14:02:03 2018 -0400
tree 5809b389297a3bec6874d55404bd7a834bfd2971
parent 857d65f08c73a1eb3adfaade51ae5ae948e6e6fb

v4l2videodec: Protect double calls to set_format()

In some cases, set_format() may get called twice before the output
format is set. Running an allocation query in this case is both not
needed and will cause assertion due tot he NULL caps.

sys/v4l2/gstv4l2videodec.c

diff --git a/sys/v4l2/gstv4l2videodec.c b/sys/v4l2/gstv4l2videodec.c
index a00ccd9..838ebff 100644
--- a/sys/v4l2/gstv4l2videodec.c
+++ b/sys/v4l2/gstv4l2videodec.c
@@ -260,10 +260,12 @@
      * block. */
     {
       GstCaps *caps = gst_pad_get_current_caps (decoder->srcpad);
-      GstQuery *query = gst_query_new_allocation (caps, FALSE);
-      gst_pad_peer_query (decoder->srcpad, query);
-      gst_query_unref (query);
-      gst_caps_unref (caps);
+      if (caps) {
+        GstQuery *query = gst_query_new_allocation (caps, FALSE);
+        gst_pad_peer_query (decoder->srcpad, query);
+        gst_query_unref (query);
+        gst_caps_unref (caps);
+      }
     }
 
     gst_v4l2_object_stop (self->v4l2capture);