summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.net>2007-07-11 23:43:25 +0000
committerTim-Philipp Müller <tim@centricular.net>2007-07-11 23:43:25 +0000
commit9b07457ff74a7849ddfd693d50c57bb44f58fb6c (patch)
treec42c12397be6a14f1c00e2bca105283a0898f02f
parentf5671ae2a6dbccec24bdaf96208ff9ff7c1f821c (diff)
downloadgst-plugins-bad-9b07457ff74a7849ddfd693d50c57bb44f58fb6c.tar.gz
gst-plugins-bad-9b07457ff74a7849ddfd693d50c57bb44f58fb6c.tar.bz2
gst-plugins-bad-9b07457ff74a7849ddfd693d50c57bb44f58fb6c.zip
gst/: Fix build against core CVS.
Original commit message from CVS: * gst/interleave/deinterleave.c: (gst_deinterleave_process): * gst/vmnc/vmncdec.c: (vmnc_make_buffer): Fix build against core CVS.
-rw-r--r--ChangeLog6
-rw-r--r--gst/interleave/deinterleave.c3
-rw-r--r--gst/vmnc/vmncdec.c2
3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f6a43341..30981237 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-12 Tim-Philipp Müller <tim at centricular dot net>
+
+ * gst/interleave/deinterleave.c: (gst_deinterleave_process):
+ * gst/vmnc/vmncdec.c: (vmnc_make_buffer):
+ Fix build against core CVS.
+
2007-07-09 Stefan Kost <ensonic@users.sf.net>
* REQUIREMENTS:
diff --git a/gst/interleave/deinterleave.c b/gst/interleave/deinterleave.c
index 81bf9387..71c6a413 100644
--- a/gst/interleave/deinterleave.c
+++ b/gst/interleave/deinterleave.c
@@ -251,7 +251,8 @@ gst_deinterleave_process (GstDeinterleave * self, GstBuffer * buf)
goto alloc_buffer_bad_size;
if (buffers_out[i])
- gst_buffer_stamp (buffers_out[i], buf);
+ gst_buffer_copy_metadata (buffers_out[i], buf,
+ GST_BUFFER_COPY_TIMESTAMPS);
}
/* do the thing */
diff --git a/gst/vmnc/vmncdec.c b/gst/vmnc/vmncdec.c
index 2a9a7a67..701b18e9 100644
--- a/gst/vmnc/vmncdec.c
+++ b/gst/vmnc/vmncdec.c
@@ -488,7 +488,7 @@ vmnc_make_buffer (GstVMncDec * dec, GstBuffer * inbuf)
}
if (inbuf) {
- gst_buffer_stamp (buf, inbuf);
+ gst_buffer_copy_metadata (buf, inbuf, GST_BUFFER_COPY_TIMESTAMPS);
}
gst_buffer_set_caps (buf, dec->caps);