From ef9d363dfefc9d7bd343cd2b2562104116b5b14d Mon Sep 17 00:00:00 2001
From: Lubosz Sarnecki <lubosz@gmail.com>
Date: Mon, 25 Nov 2013 16:57:00 +0000
Subject: [PATCH] pngparse: Don't try to set framerate if not from upstream

https://bugzilla.gnome.org/show_bug.cgi?id=715166
---
 gst/videoparsers/gstpngparse.c | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/gst/videoparsers/gstpngparse.c b/gst/videoparsers/gstpngparse.c
index 7c53f15666..72aadb1e57 100644
--- a/gst/videoparsers/gstpngparse.c
+++ b/gst/videoparsers/gstpngparse.c
@@ -161,31 +161,35 @@ gst_png_parse_handle_frame (GstBaseParse * parse,
 
     if (code == GST_MAKE_FOURCC ('I', 'E', 'N', 'D')) {
       if (pngparse->width != width || pngparse->height != height) {
-        GstStructure *st = NULL;
         GstCaps *caps, *sink_caps;
-        gint fr_num, fr_denom;
 
         pngparse->height = height;
         pngparse->width = width;
 
+        caps = gst_caps_new_simple ("image/png",
+            "width", G_TYPE_INT, width, "height", G_TYPE_INT, height, NULL);
+
         sink_caps =
             gst_pad_get_current_caps (GST_BASE_PARSE_SINK_PAD (pngparse));
-        if (sink_caps && (st = gst_caps_get_structure (sink_caps, 0))
-            && gst_structure_get_fraction (st, "framerate", &fr_num, &fr_denom)) {
-          /* Got it in caps - nothing more to do */
-          GST_DEBUG_OBJECT (pngparse,
-              "sink caps override framerate from headers");
-        } else {
-          GST_INFO_OBJECT (pngparse, "No framerate set");
+
+        if (sink_caps) {
+          GstStructure *st;
+          gint fr_num, fr_denom;
+
+          st = gst_caps_get_structure (sink_caps, 0);
+          if (st
+              && gst_structure_get_fraction (st, "framerate", &fr_num,
+                  &fr_denom)) {
+            gst_caps_set_simple (caps,
+                "framerate", GST_TYPE_FRACTION, fr_num, fr_denom, NULL);
+          } else {
+            GST_WARNING_OBJECT (pngparse, "No framerate set");
+          }
         }
 
-        caps = gst_caps_new_simple ("image/png",
-            "width", G_TYPE_INT, width, "height", G_TYPE_INT, height,
-            "framerate", GST_TYPE_FRACTION, fr_num, fr_denom, NULL);
-
-        if (!gst_pad_set_caps (GST_BASE_PARSE_SRC_PAD (parse), caps)) {
+        if (!gst_pad_set_caps (GST_BASE_PARSE_SRC_PAD (parse), caps))
           ret = GST_FLOW_NOT_NEGOTIATED;
-        }
+
         gst_caps_unref (caps);
 
         if (ret != GST_FLOW_OK)