From 1698d3254d2b4e08ff27df1fa69a55d2b02fe0d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Thu, 21 Nov 2013 15:54:32 +0000 Subject: [PATCH] qtwrapper: g_memmove() is deprecated Just use plain memmove(), g_memmove() is deprecated in recent GLib versions. https://bugzilla.gnome.org/show_bug.cgi?id=712811 --- sys/qtwrapper/audiodecoders.c | 2 +- sys/qtwrapper/imagedescription.c | 4 ++-- sys/qtwrapper/videodecoders.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/qtwrapper/audiodecoders.c b/sys/qtwrapper/audiodecoders.c index 2ba1838dca..0a6ddbc15c 100644 --- a/sys/qtwrapper/audiodecoders.c +++ b/sys/qtwrapper/audiodecoders.c @@ -837,7 +837,7 @@ qtwrapper_audio_decoder_chain (GstPad * pad, GstBuffer * buf) goto beach; /* copy data from bufferlist to output buffer */ - g_memmove (GST_BUFFER_DATA (outbuf), + memmove (GST_BUFFER_DATA (outbuf), qtwrapper->bufferlist->mBuffers[0].mData, realbytes); /* 5. calculate timestamp and duration */ diff --git a/sys/qtwrapper/imagedescription.c b/sys/qtwrapper/imagedescription.c index 98221934e5..e14d60be9d 100644 --- a/sys/qtwrapper/imagedescription.c +++ b/sys/qtwrapper/imagedescription.c @@ -59,7 +59,7 @@ image_description_for_avc1 (GstBuffer * buf) /* write size in Big-Endian */ GST_WRITE_UINT32_BE (pos, GST_BUFFER_SIZE (buf) + 8); GST_WRITE_UINT32_LE (pos + 4, QT_MAKE_FOURCC_BE ('a', 'v', 'c', 'C')); - g_memmove (pos + 8, GST_BUFFER_DATA (buf), GST_BUFFER_SIZE (buf)); + memmove (pos + 8, GST_BUFFER_DATA (buf), GST_BUFFER_SIZE (buf)); return desc; } @@ -126,7 +126,7 @@ image_description_for_mp4v (GstBuffer * buf) /* size */ QT_WRITE_UINT8 (location + 33, GST_BUFFER_SIZE (buf)); /* codec data */ - g_memmove (location + 34, GST_BUFFER_DATA (buf), GST_BUFFER_SIZE (buf)); + memmove (location + 34, GST_BUFFER_DATA (buf), GST_BUFFER_SIZE (buf)); /* end */ QT_WRITE_UINT8 (location + 34 + GST_BUFFER_SIZE (buf), 0x06); QT_WRITE_UINT8 (location + 34 + GST_BUFFER_SIZE (buf) + 1, 0x01); diff --git a/sys/qtwrapper/videodecoders.c b/sys/qtwrapper/videodecoders.c index fa4a42bcc1..8c507e7790 100644 --- a/sys/qtwrapper/videodecoders.c +++ b/sys/qtwrapper/videodecoders.c @@ -605,11 +605,11 @@ decompressCb (void *decompressionTrackingRefCon, /* special copy for stride handling */ for (i = 0; i < qtwrapper->height; i++) - g_memmove (GST_BUFFER_DATA (outbuf) + realpixels * i, + memmove (GST_BUFFER_DATA (outbuf) + realpixels * i, addr + stride * i, realpixels); } else - g_memmove (GST_BUFFER_DATA (outbuf), addr, (int) qtwrapper->outsize); + memmove (GST_BUFFER_DATA (outbuf), addr, (int) qtwrapper->outsize); /* Release CVPixelBuffer */ CVPixelBufferUnlockBaseAddress (pixelBuffer, 0);