From cf953fe923c02ccc7608858ed821af85fb0df0b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk>
Date: Sat, 16 Apr 2011 18:17:01 +0100
Subject: [PATCH] qtmux: refuse incomplete legacy h264 caps

Refuse h264 caps without stream-format and codec_data fields for
now, to avoid creating broken files. This might cause some pipelines
that worked previously to fail. However, the move from -bad to -good
is our only chance to fix this up, so make it strict for now. We can
always change it back to be less strict in future.

https://bugzilla.gnome.org/show_bug.cgi?id=647919
---
 gst/quicktime/gstqtmux.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gst/quicktime/gstqtmux.c b/gst/quicktime/gstqtmux.c
index a840ed6e49..0bfbd97f6a 100644
--- a/gst/quicktime/gstqtmux.c
+++ b/gst/quicktime/gstqtmux.c
@@ -2991,10 +2991,12 @@ gst_qt_mux_video_sink_set_caps (GstPad * pad, GstCaps * caps)
       }
     } else {
       GST_WARNING_OBJECT (qtmux, "no stream-format field in h264 caps");
+      goto refuse_caps;
     }
 
     if (!codec_data) {
       GST_WARNING_OBJECT (qtmux, "no codec_data in h264 caps");
+      goto refuse_caps;
     }
 
     entry.fourcc = FOURCC_avc1;