[gst-cvs] gst-plugins-bad: vdpauvideopostprocess: remove par from caps since we don' t handle it yet

[Jan Schmidt]

Module: gst-plugins-bad
Branch: master
Commit: 0b979b48fccedfa193a97d173ad711410c0e5f4f
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=0b979b48fccedfa193a97d173ad711410c0e5f4f

Author: Carl-Anton Ingmarsson <ca.ingmarsson at gmail.com>
Date:   Wed Aug 19 22:52:34 2009 +0200

vdpauvideopostprocess: remove par from caps since we don't handle it yet

---

 sys/vdpau/gstvdputils.c            |    3 +++
 sys/vdpau/gstvdpvideopostprocess.c |    3 +++
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/sys/vdpau/gstvdputils.c b/sys/vdpau/gstvdputils.c
index 4b34f0d..ecb6352 100644
--- a/sys/vdpau/gstvdputils.c
+++ b/sys/vdpau/gstvdputils.c
@@ -134,6 +134,9 @@ gst_vdp_video_to_output_caps (GstCaps * caps)
 
     gst_structure_set_name (structure, "video/x-vdpau-output");
     gst_structure_remove_field (structure, "chroma-type");
+
+    /* FIXME: don't know what to do with pixel-aspect-ratio */
+    gst_structure_remove_field (structure, "pixel-aspect-ratio");
   }
 
   return result;
diff --git a/sys/vdpau/gstvdpvideopostprocess.c b/sys/vdpau/gstvdpvideopostprocess.c
index 6f055c5..7b965e9 100644
--- a/sys/vdpau/gstvdpvideopostprocess.c
+++ b/sys/vdpau/gstvdpvideopostprocess.c
@@ -514,6 +514,9 @@ gst_vdp_vpp_sink_setcaps (GstPad * pad, GstCaps * caps)
 
   src_caps = gst_caps_intersect (output_caps, allowed_caps);
   gst_caps_truncate (src_caps);
+  if (gst_caps_is_empty (src_caps))
+    goto invalid_caps;
+
   GST_DEBUG ("output_caps: %" GST_PTR_FORMAT " allowed_caps: %" GST_PTR_FORMAT
       " src_caps: %" GST_PTR_FORMAT, output_caps, allowed_caps, src_caps);