summaryrefslogtreecommitdiffstats
path: root/gst
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@collabora.co.uk>2009-05-21 16:00:46 +0200
committerWim Taymans <wim.taymans@collabora.co.uk>2009-05-22 11:02:07 +0200
commit580b20d6cc155b21e7b0f74f0e4fd28af2c7ce41 (patch)
treef2755efa00b42ae7dd14a6fdd169a42b9bd4e703 /gst
parent9618c437842818896eb39d2306865ab968adb546 (diff)
downloadgst-plugins-bad-580b20d6cc155b21e7b0f74f0e4fd28af2c7ce41.tar.gz
gst-plugins-bad-580b20d6cc155b21e7b0f74f0e4fd28af2c7ce41.tar.bz2
gst-plugins-bad-580b20d6cc155b21e7b0f74f0e4fd28af2c7ce41.zip
mpegtsdemux: fix memleaks and refcounts
Use correct constants for PID_type so that we clear the right filter. provide_clock must return a ref to a clock.
Diffstat (limited to 'gst')
-rw-r--r--gst/mpegdemux/gstmpegtsdemux.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/gst/mpegdemux/gstmpegtsdemux.c b/gst/mpegdemux/gstmpegtsdemux.c
index cad385d0..6438e880 100644
--- a/gst/mpegdemux/gstmpegtsdemux.c
+++ b/gst/mpegdemux/gstmpegtsdemux.c
@@ -382,8 +382,8 @@ gst_mpegts_demux_reset (GstMpegTSDemux * demux)
case PID_TYPE_ELEMENTARY:
gst_pes_filter_uninit (&stream->filter);
break;
- case PID_PROGRAM_ASSOCIATION_TABLE:
- case PID_CONDITIONAL_ACCESS_TABLE:
+ case PID_TYPE_PROGRAM_ASSOCIATION:
+ case PID_TYPE_CONDITIONAL_ACCESS:
case PID_TYPE_PROGRAM_MAP:
gst_section_filter_uninit (&stream->section_filter);
break;
@@ -2620,8 +2620,7 @@ gst_mpegts_demux_provide_clock (GstElement * element)
"MpegTSClock", NULL);
demux->clock_base = GST_CLOCK_TIME_NONE;
}
-
- return demux->clock;
+ return gst_object_ref (demux->clock);
}
return NULL;