1 files changed, 47 insertions, 1 deletions

diff --git a/gst/mpegdemux/gstmpegtsdemux.c b/gst/mpegdemux/gstmpegtsdemux.c
index cb082a2b..8de7cc75 100644
--- a/gst/mpegdemux/gstmpegtsdemux.c
+++ b/gst/mpegdemux/gstmpegtsdemux.c
@@ -1697,7 +1697,8 @@ gst_mpegts_demux_parse_adaptation_field (GstMpegTSStream * stream,
           memset (pmts_checked, 0, sizeof (gboolean) * (MPEGTS_MAX_PID + 1));
 
           for (j = 0; j < MPEGTS_MAX_PID + 1; j++) {
-            if (demux->streams[j] && demux->streams[j]->PMT_pid) {
+            if (demux->streams[j]
+                && demux->streams[j]->PMT_pid <= MPEGTS_MAX_PID) {
               if (!pmts_checked[demux->streams[j]->PMT_pid]) {
                 /* check if this is correct pcr for pmt */
                 if (demux->streams[demux->streams[j]->PMT_pid] &&
@@ -2777,9 +2778,54 @@ gst_mpegts_demux_src_pad_query (GstPad * pad, GstQuery * query)
       }
       break;
     }
+    case GST_QUERY_SEEKING:{
+      GstFormat fmt;
+
+      gst_query_parse_seeking (query, &fmt, NULL, NULL, NULL);
+      if (fmt == GST_FORMAT_BYTES) {
+        /* Seeking in BYTES format not supported at all */
+        gst_query_set_seeking (query, fmt, FALSE, -1, -1);
+      } else {
+        GstQuery *peerquery;
+        gboolean seekable;
+
+        /* Then ask upstream */
+        res = gst_pad_peer_query (demux->sinkpad, query);
+        if (res) {
+          /* If upstream can handle seeks we're done, if it
+           * can't we still have our TIME->BYTES conversion seek
+           */
+          gst_query_parse_seeking (query, NULL, &seekable, NULL, NULL);
+          if (seekable || fmt != GST_FORMAT_TIME)
+            goto beach;
+        }
+
+        /* We can seek if upstream supports BYTES seeks and we
+         * have a bitrate
+         */
+        peerquery = gst_query_new_seeking (GST_FORMAT_BYTES);
+        res = gst_pad_peer_query (demux->sinkpad, query);
+        if (!res || demux->bitrate == -1) {
+          gst_query_set_seeking (query, fmt, FALSE, -1, -1);
+        } else {
+          gst_query_parse_seeking (peerquery, NULL, &seekable, NULL, NULL);
+          if (seekable)
+            gst_query_set_seeking (query, GST_FORMAT_TIME, TRUE, 0, -1);
+          else
+            gst_query_set_seeking (query, fmt, FALSE, -1, -1);
+        }
+
+        gst_query_unref (peerquery);
+        res = TRUE;
+      }
+      break;
+    }
     default:
       res = gst_pad_query_default (pad, query);
+      break;
   }
+
+beach:
   gst_object_unref (demux);
 
   return res;