diff options
| author | Edward Hervey <edward@collabora.com> | 2014-05-13 13:54:23 +0200 |
|---|---|---|
| committer | Edward Hervey <edward@collabora.com> | 2014-05-13 13:54:23 +0200 |
| commit | 1b5e514a05126b48a9a69590e98e4392c0deda23 (patch) | |
| tree | 75f907a7949b88297a32c7b23f667df68dc1a49f | |
| parent | 651a4ae2e79a9456fc79a6e540e78ed75cf2c042 (diff) | |
| download | gstreamer-plugins-bad-1b5e514a05126b48a9a69590e98e4392c0deda23.tar.gz | |
mpegtbase: Small rewrite
Setting done was useless anyway
| -rw-r--r-- | gst/mpegtsdemux/mpegtsbase.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/gst/mpegtsdemux/mpegtsbase.c b/gst/mpegtsdemux/mpegtsbase.c index bd105c881..0fef7c720 100644 --- a/gst/mpegtsdemux/mpegtsbase.c +++ b/gst/mpegtsdemux/mpegtsbase.c @@ -1194,12 +1194,10 @@ mpegts_base_scan (MpegTSBase * base) GST_DEBUG ("Grabbing %d => %d", i * 65536, 65536); ret = gst_pad_pull_range (base->sinkpad, i * 65536, 65536, &buf); - if (G_UNLIKELY (ret == GST_FLOW_EOS)) { - done = TRUE; + if (G_UNLIKELY (ret == GST_FLOW_EOS)) break; - } else if (G_UNLIKELY (ret != GST_FLOW_OK)) { + if (G_UNLIKELY (ret != GST_FLOW_OK)) goto beach; - } /* Push to packetizer */ mpegts_packetizer_push (base->packetizer, buf); @@ -1247,12 +1245,10 @@ mpegts_base_scan (MpegTSBase * base) GST_DEBUG ("Grabbing %" G_GUINT64_FORMAT " => %d", seek_pos, 65536); ret = gst_pad_pull_range (base->sinkpad, seek_pos, 65536, &buf); - if (G_UNLIKELY (ret == GST_FLOW_EOS)) { - done = TRUE; + if (G_UNLIKELY (ret == GST_FLOW_EOS)) break; - } else if (G_UNLIKELY (ret != GST_FLOW_OK)) { + if (G_UNLIKELY (ret != GST_FLOW_OK)) goto beach; - } /* Push to packetizer */ mpegts_packetizer_push (base->packetizer, buf); |