Commit 09c161da authored by Tim-Philipp Müller's avatar Tim-Philipp Müller 🐠
Browse files

Fix build against core CVS.

Original commit message from CVS:
* ext/cairo/gsttimeoverlay.c: (gst_cairo_time_overlay_transform):
* ext/jpeg/gstjpegenc.c: (gst_jpegenc_chain):
* ext/libpng/gstpngenc.c: (gst_pngenc_chain):
* ext/wavpack/gstwavpackdec.c: (gst_wavpack_dec_chain):
* gst/debug/gstnavigationtest.c: (gst_navigationtest_transform):
* gst/effectv/gstaging.c: (gst_agingtv_transform):
* gst/effectv/gstdice.c: (gst_dicetv_transform):
* gst/effectv/gstedge.c: (gst_edgetv_transform):
* gst/effectv/gstquark.c: (gst_quarktv_transform):
* gst/effectv/gstrev.c: (gst_revtv_transform):
* gst/effectv/gstshagadelic.c: (gst_shagadelictv_transform):
* gst/effectv/gstvertigo.c: (gst_vertigotv_transform):
* gst/effectv/gstwarp.c: (gst_warptv_transform):
* gst/matroska/matroska-demux.c:
(gst_matroska_demux_add_wvpk_header),
(gst_matroska_demux_check_subtitle_buffer),
(gst_matroska_decode_buffer):
* gst/videofilter/gstvideoflip.c: (gst_video_flip_transform):
Fix build against core CVS.
parent 4844ca4e
2007-07-11 Tim-Philipp Müller <tim at centricular dot net>
* ext/cairo/gsttimeoverlay.c: (gst_cairo_time_overlay_transform):
* ext/jpeg/gstjpegenc.c: (gst_jpegenc_chain):
* ext/libpng/gstpngenc.c: (gst_pngenc_chain):
* ext/wavpack/gstwavpackdec.c: (gst_wavpack_dec_chain):
* gst/debug/gstnavigationtest.c: (gst_navigationtest_transform):
* gst/effectv/gstaging.c: (gst_agingtv_transform):
* gst/effectv/gstdice.c: (gst_dicetv_transform):
* gst/effectv/gstedge.c: (gst_edgetv_transform):
* gst/effectv/gstquark.c: (gst_quarktv_transform):
* gst/effectv/gstrev.c: (gst_revtv_transform):
* gst/effectv/gstshagadelic.c: (gst_shagadelictv_transform):
* gst/effectv/gstvertigo.c: (gst_vertigotv_transform):
* gst/effectv/gstwarp.c: (gst_warptv_transform):
* gst/matroska/matroska-demux.c:
(gst_matroska_demux_add_wvpk_header),
(gst_matroska_demux_check_subtitle_buffer),
(gst_matroska_decode_buffer):
* gst/videofilter/gstvideoflip.c: (gst_video_flip_transform):
Fix build against core CVS.
2007-07-10 Edward Hervey <bilboed@gmail.com>
* gst/id3demux/gstid3demux.c: (gst_id3demux_chain):
......
......@@ -193,7 +193,7 @@ gst_cairo_time_overlay_transform (GstBaseTransform * trans, GstBuffer * in,
timeoverlay = GST_CAIRO_TIME_OVERLAY (trans);
gst_buffer_stamp (out, in);
gst_buffer_copy_metadata (out, in, GST_BUFFER_COPY_TIMESTAMPS);
src = GST_BUFFER_DATA (in);
dest = GST_BUFFER_DATA (out);
......
......@@ -430,7 +430,7 @@ gst_jpegenc_chain (GstPad * pad, GstBuffer * buf)
if (ret != GST_FLOW_OK)
goto done;
gst_buffer_stamp (outbuf, buf);
gst_buffer_copy_metadata (outbuf, buf, GST_BUFFER_COPY_TIMESTAMPS);
width = jpegenc->width;
height = jpegenc->height;
......
......@@ -316,7 +316,8 @@ gst_pngenc_chain (GstPad * pad, GstBuffer * buf)
png_destroy_info_struct (pngenc->png_struct_ptr, &pngenc->png_info_ptr);
png_destroy_write_struct (&pngenc->png_struct_ptr, (png_infopp) NULL);
gst_buffer_stamp (pngenc->buffer_out, buf);
gst_buffer_copy_metadata (pngenc->buffer_out, buf,
GST_BUFFER_COPY_TIMESTAMPS);
gst_buffer_unref (buf);
gst_buffer_set_caps (pngenc->buffer_out, GST_PAD_CAPS (pngenc->srcpad));
......
......@@ -359,7 +359,8 @@ gst_wavpack_dec_chain (GstPad * pad, GstBuffer * buf)
if (ret != GST_FLOW_OK)
goto out;
gst_buffer_stamp (outbuf, buf);
gst_buffer_copy_metadata (outbuf, buf, GST_BUFFER_COPY_TIMESTAMPS);
/* If we got a DISCONT buffer forward the flag. Nothing else
* has to be done as libwavpack doesn't store state between
* Wavpack blocks */
......
......@@ -214,7 +214,7 @@ gst_navigationtest_transform (GstBaseTransform * trans, GstBuffer * in,
/* do something interesting here. This simply copies the source
* to the destination. */
gst_buffer_stamp (out, in);
gst_buffer_copy_metadata (out, in, GST_BUFFER_COPY_TIMESTAMPS);
memcpy (GST_BUFFER_DATA (out), GST_BUFFER_DATA (in),
MIN (GST_BUFFER_SIZE (in), GST_BUFFER_SIZE (out)));
......
......@@ -316,7 +316,7 @@ gst_agingtv_transform (GstBaseTransform * trans, GstBuffer * in,
gint area_scale = width * height / 64 / 480;
GstFlowReturn ret = GST_FLOW_OK;
gst_buffer_stamp (out, in);
gst_buffer_copy_metadata (out, in, GST_BUFFER_COPY_TIMESTAMPS);
if (area_scale <= 0)
area_scale = 1;
......
......@@ -167,7 +167,7 @@ gst_dicetv_transform (GstBaseTransform * trans, GstBuffer * in, GstBuffer * out)
src = (guint32 *) GST_BUFFER_DATA (in);
dest = (guint32 *) GST_BUFFER_DATA (out);
gst_buffer_stamp (out, in);
gst_buffer_copy_metadata (out, in, GST_BUFFER_COPY_TIMESTAMPS);
video_width = filter->width;
g_cube_bits = filter->g_cube_bits;
......
......@@ -148,7 +148,7 @@ gst_edgetv_transform (GstBaseTransform * trans, GstBuffer * in, GstBuffer * out)
filter = GST_EDGETV (trans);
gst_buffer_stamp (out, in);
gst_buffer_copy_metadata (out, in, GST_BUFFER_COPY_TIMESTAMPS);
src = (guint32 *) GST_BUFFER_DATA (in);
dest = (guint32 *) GST_BUFFER_DATA (out);
......
......@@ -161,7 +161,7 @@ gst_quarktv_transform (GstBaseTransform * trans, GstBuffer * in,
filter = GST_QUARKTV (trans);
gst_buffer_stamp (out, in);
gst_buffer_copy_metadata (out, in, GST_BUFFER_COPY_TIMESTAMPS);
area = filter->area;
src = (guint32 *) GST_BUFFER_DATA (in);
......
......@@ -169,7 +169,7 @@ gst_revtv_transform (GstBaseTransform * trans, GstBuffer * in, GstBuffer * out)
filter = GST_REVTV (trans);
gst_buffer_stamp (out, in);
gst_buffer_copy_metadata (out, in, GST_BUFFER_COPY_TIMESTAMPS);
src = (guint32 *) GST_BUFFER_DATA (in);
dest = (guint32 *) GST_BUFFER_DATA (out);
......
......@@ -228,7 +228,7 @@ gst_shagadelictv_transform (GstBaseTransform * trans, GstBuffer * in,
filter = GST_SHAGADELICTV (trans);
gst_buffer_stamp (out, in);
gst_buffer_copy_metadata (out, in, GST_BUFFER_COPY_TIMESTAMPS);
src = (guint32 *) GST_BUFFER_DATA (in);
dest = (guint32 *) GST_BUFFER_DATA (out);
......
......@@ -210,7 +210,7 @@ gst_vertigotv_transform (GstBaseTransform * trans, GstBuffer * in,
filter = GST_VERTIGOTV (trans);
gst_buffer_stamp (out, in);
gst_buffer_copy_metadata (out, in, GST_BUFFER_COPY_TIMESTAMPS);
src = (guint32 *) GST_BUFFER_DATA (in);
dest = (guint32 *) GST_BUFFER_DATA (out);
......
......@@ -227,7 +227,7 @@ gst_warptv_transform (GstBaseTransform * trans, GstBuffer * in, GstBuffer * out)
gint32 *sintable, *ctable;
GstFlowReturn ret = GST_FLOW_OK;
gst_buffer_stamp (out, in);
gst_buffer_copy_metadata (out, in, GST_BUFFER_COPY_TIMESTAMPS);
xw = (gint) (sin ((warptv->tval + 100) * M_PI / 128) * 30);
yw = (gint) (sin ((warptv->tval) * M_PI / 256) * -35);
......
......@@ -2416,7 +2416,7 @@ gst_matroska_demux_add_wvpk_header (GstMatroskaTrackContext * stream,
GST_WRITE_UINT32_LE (data + 12, wvh.total_samples);
GST_WRITE_UINT32_LE (data + 16, wvh.block_index);
g_memmove (data + 20, GST_BUFFER_DATA (*buf), block_length);
gst_buffer_stamp (newbuf, *buf);
gst_buffer_copy_metadata (newbuf, *buf, GST_BUFFER_COPY_TIMESTAMPS);
gst_buffer_unref (*buf);
*buf = newbuf;
return TRUE;
......@@ -2485,7 +2485,7 @@ gst_matroska_demux_check_subtitle_buffer (GstMatroskaDemux * demux,
GST_BUFFER_MALLOCDATA (newbuf) = (guint8 *) utf8;
GST_BUFFER_DATA (newbuf) = (guint8 *) utf8;
GST_BUFFER_SIZE (newbuf) = strlen (utf8);
gst_buffer_stamp (newbuf, buf);
gst_buffer_copy_metadata (newbuf, buf, GST_BUFFER_COPY_TIMESTAMPS);
gst_buffer_unref (buf);
return newbuf;
......@@ -2572,7 +2572,7 @@ gst_matroska_decode_buffer (GstMatroskaTrackContext * context, GstBuffer * buf)
GST_BUFFER_MALLOCDATA (new_buf) = (guint8 *) new_data;
GST_BUFFER_DATA (new_buf) = (guint8 *) new_data;
GST_BUFFER_SIZE (new_buf) = new_size;
gst_buffer_stamp (new_buf, buf);
gst_buffer_copy_metadata (new_buf, buf, GST_BUFFER_COPY_TIMESTAMPS);
gst_buffer_unref (buf);
buf = new_buf;
......
......@@ -475,7 +475,7 @@ gst_video_flip_transform (GstBaseTransform * trans, GstBuffer * in,
videoflip = GST_VIDEO_FLIP (trans);
gst_buffer_stamp (out, in);
gst_buffer_copy_metadata (out, in, GST_BUFFER_COPY_TIMESTAMPS);
src = GST_BUFFER_DATA (in);
dest = GST_BUFFER_DATA (out);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment