diff --git a/ChangeLog b/ChangeLog index d1b98aa4a6..26be6007f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-11-11 Thijs Vermeir + + * gst/mpegstream/gstmpegdemux.c: + recognize the padding stream + 2007-10-31 Tim-Philipp Müller * gst/asfdemux/gstasfdemux.c: (gst_asf_demux_process_ext_content_desc): diff --git a/common b/common index 34d7d649b9..423e2ea96b 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 34d7d649b972ea4915611a6ed88f01613bf32777 +Subproject commit 423e2ea96b5f79281f4dd20d734bd968b3d95e89 diff --git a/gst/mpegstream/gstmpegdemux.c b/gst/mpegstream/gstmpegdemux.c index 5066919658..3a1a24d0ea 100644 --- a/gst/mpegstream/gstmpegdemux.c +++ b/gst/mpegstream/gstmpegdemux.c @@ -763,6 +763,9 @@ done: id - 0xE0, GST_MPEG_DEMUX_VIDEO_MPEG, &mpeg_version); ret = CLASS (mpeg_demux)->send_subbuffer (mpeg_demux, outstream, buffer, timestamp, headerlen + 4, datalen); + } else if (id == 0xBE) { + /* padding stream */ + GST_DEBUG_OBJECT (mpeg_demux, "we have a padding packet"); } else { GST_WARNING_OBJECT (mpeg_demux, "unknown stream id 0x%02x", id); }