summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien Moutte <julien@moutte.net>2008-02-08 15:20:31 +0000
committerJulien Moutte <julien@moutte.net>2008-02-08 15:20:31 +0000
commit19a278f7d857ee05e0e9ec2f52c0d16c5170132f (patch)
tree9d2494de2ca3158b5a4f901315d7596aac5c3d55
parent49d2efed868b3a88e96bffd48a1d9e08860168c0 (diff)
gst/matroska/matroska-demux.c: Flag keyframe and delta units correctly when dealign with a
Original commit message from CVS: 2008-02-08 Julien Moutte <julien@fluendo.com> * gst/matroska/matroska-demux.c: (gst_matroska_demux_parse_blockgroup_or_simpleblock): Flag keyframe and delta units correctly when dealign with a BlockGroup. Fixes: #514397
-rw-r--r--ChangeLog7
m---------common0
-rw-r--r--gst/matroska/matroska-demux.c6
3 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 6cb0cc72..76c67031 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-02-08 Julien Moutte <julien@fluendo.com>
+
+ * gst/matroska/matroska-demux.c:
+ (gst_matroska_demux_parse_blockgroup_or_simpleblock): Flag
+ keyframe and delta units correctly when dealign with a BlockGroup.
+ Fixes: #514397
+
2008-02-08 Jan Schmidt <jan.schmidt@sun.com>
* tests/check/elements/.cvsignore:
diff --git a/common b/common
-Subproject 8b37d7ee833fab1d25b484d8574df3dae231b5f
+Subproject df7f73bd454e0b0ee7870d8c85874aba9329fd2
diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c
index aa570d71..8feaa387 100644
--- a/gst/matroska/matroska-demux.c
+++ b/gst/matroska/matroska-demux.c
@@ -2925,6 +2925,12 @@ gst_matroska_demux_parse_blockgroup_or_simpleblock (GstMatroskaDemux * demux,
GST_BUFFER_FLAG_UNSET (sub, GST_BUFFER_FLAG_DELTA_UNIT);
else
GST_BUFFER_FLAG_SET (sub, GST_BUFFER_FLAG_DELTA_UNIT);
+ } else {
+ if (referenceblock) {
+ GST_BUFFER_FLAG_SET (sub, GST_BUFFER_FLAG_DELTA_UNIT);
+ } else {
+ GST_BUFFER_FLAG_UNSET (sub, GST_BUFFER_FLAG_DELTA_UNIT);
+ }
}
if (stream->set_discont) {