mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-01 03:52:25 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/0.10'

Browse source 
Conflicts:
	gst/mpegtsdemux/tsdemux.c
This commit is contained in:
Sebastian Dröge 2012-04-02 15:31:38 +02:00
commit bc07e44546
4 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gst/mpegtsdemux/Makefile.am
View file

@ -1,8 +1,5 @@
plugin_LTLIBRARIES = libgstmpegtsdemux.la plugin_LTLIBRARIES = libgstmpegtsdemux.la
# FIXME 0.11: ignore GValueArray warnings for now until this is sorted
ERROR_CFLAGS=
libgstmpegtsdemux_la_SOURCES = \ libgstmpegtsdemux_la_SOURCES = \
gsttsdemux.c \ gsttsdemux.c \
gstmpegdesc.c \ gstmpegdesc.c \

4
gst/mpegtsdemux/mpegtsbase.c
View file

@ -1399,9 +1399,11 @@ mpegts_base_chain (GstPad * pad, GstBuffer * buf)
based = mpegts_base_handle_psi (base, &section); based = mpegts_base_handle_psi (base, &section);
gst_buffer_unref (section.buffer); gst_buffer_unref (section.buffer);
if (G_UNLIKELY (!based)) if (G_UNLIKELY (!based)) {
gst_buffer_unref (packet.buffer);
/* bad PSI table */ /* bad PSI table */
goto next; goto next;
}
} }
/* we need to push section packet downstream */ /* we need to push section packet downstream */
res = mpegts_base_push (base, &packet, &section); res = mpegts_base_push (base, &packet, &section);

7
gst/mpegtsdemux/mpegtspacketizer.c
View file

@ -2375,8 +2375,13 @@ MpegTSPacketizerPacketReturn
mpegts_packetizer_process_next_packet (MpegTSPacketizer2 * packetizer) mpegts_packetizer_process_next_packet (MpegTSPacketizer2 * packetizer)
{ {
MpegTSPacketizerPacket packet; MpegTSPacketizerPacket packet;
MpegTSPacketizerPacketReturn ret;
return mpegts_packetizer_next_packet (packetizer, &packet); ret = mpegts_packetizer_next_packet (packetizer, &packet);
if (packet.buffer)
gst_buffer_unref (packet.buffer);
return ret;
} }
void void

10
gst/mpegtsdemux/tsdemux.c
View file

@ -1032,6 +1032,16 @@ gst_ts_demux_stream_flush (TSDemuxStream * stream)
memset (stream->pendingbuffers, 0, TS_MAX_PENDING_BUFFERS); memset (stream->pendingbuffers, 0, TS_MAX_PENDING_BUFFERS);
stream->nbpending = 0; stream->nbpending = 0;
if (stream->current) {
gst_buffer_list_unref (stream->current);
stream->current = NULL;
}
if (stream->currentit) {
gst_buffer_list_iterator_free (stream->currentit);
stream->currentit = NULL;
}
if (stream->currentlist) { if (stream->currentlist) {
g_list_foreach (stream->currentlist, (GFunc) gst_buffer_unref, NULL); g_list_foreach (stream->currentlist, (GFunc) gst_buffer_unref, NULL);
g_list_free (stream->currentlist); g_list_free (stream->currentlist);