Attachment 174479 Details for Bug 212461 – patch

patch

patch-gst-libs_gst_adaptivedemux_gstadaptivedemux.c (text/x-csrc), 1.37 KB, created by Carlos J. Puga Medina on 2016-09-07 16:58:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos J. Puga Medina

Created: 2016-09-07 16:58:11 UTC

Size: 1.37 KB

patch

obsolete

>--- gst-libs/gst/adaptivedemux/gstadaptivedemux.c.orig	2016-09-07 16:05:28 UTC
>+++ gst-libs/gst/adaptivedemux/gstadaptivedemux.c
>@@ -1092,7 +1092,6 @@ gst_adaptive_demux_find_stream_for_pad (
>       return stream;
>     }
>   }
>-  g_assert_not_reached ();
>   return NULL;
> }
> 
>@@ -1241,6 +1240,7 @@ gst_adaptive_demux_src_event (GstPad * p
>       gboolean update;
>       gboolean ret = TRUE;
>       GstSegment oldsegment;
>+      GstAdaptiveDemuxStream *stream = NULL;
> 
>       GST_INFO_OBJECT (demux, "Received seek event");
> 
>@@ -1318,9 +1318,8 @@ gst_adaptive_demux_src_event (GstPad * p
>        * use the one that received the event as the 'leading'
>        * one to do the snap seek.
>        */
>-      if (IS_SNAP_SEEK (flags) && demux_class->stream_seek) {
>-        GstAdaptiveDemuxStream *stream =
>-            gst_adaptive_demux_find_stream_for_pad (demux, pad);
>+      if (IS_SNAP_SEEK (flags) && demux_class->stream_seek && (stream = 
>+              gst_adaptive_demux_find_stream_for_pad (demux, pad))) {
>         GstClockTime ts;
>         GstSeekFlags stream_seek_flags = flags;
> 
>@@ -1359,6 +1358,7 @@ gst_adaptive_demux_src_event (GstPad * p
>         GST_DEBUG_OBJECT (demux, "Adapted snap seek to %" GST_PTR_FORMAT,
>             event);
>       }
>+      stream = NULL;
> 
>       gst_segment_do_seek (&demux->segment, rate, format, flags, start_type,
>           start, stop_type, stop, &update);

Flags:

cpm: maintainer-approval? (multimedia)

Actions: View

Attachments on bug 212461: 174479