From: Thijs Vermeir <thijsvermeir@gmail.com>
Date: Sun, 11 Nov 2007 20:41:32 +0000 (+0000)
Subject: gst/mpegstream/gstmpegdemux.c: recognize the padding stream
X-Git-Tag: 1.19.3~505^2~1672
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4cbb91cb0274d5e5f11a338be1d75d79fdb27611;p=platform%2Fupstream%2Fgstreamer.git

gst/mpegstream/gstmpegdemux.c: recognize the padding stream

Original commit message from CVS:
* gst/mpegstream/gstmpegdemux.c:
recognize the padding stream
---

diff --git a/ChangeLog b/ChangeLog
index d1b98aa..26be600 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-11  Thijs Vermeir  <thijsvermeir@gmail.com>
+
+	* gst/mpegstream/gstmpegdemux.c:
+	recognize the padding stream
+
 2007-10-31  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* gst/asfdemux/gstasfdemux.c: (gst_asf_demux_process_ext_content_desc):
diff --git a/common b/common
index 34d7d64..423e2ea 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 5066919..3a1a24d 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);
   }