summaryrefslogtreecommitdiffstats
path: root/gst
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.net>2006-01-26 16:23:42 +0000
committerTim-Philipp Müller <tim@centricular.net>2006-01-26 16:23:42 +0000
commitd748422b60f691885b3d25a3555e4fc597615e66 (patch)
tree1660c9833a9d2138652b51012531114658d5d742 /gst
parent8fe3f072722c3ffd241d5a3a8b01800ccd8b5c63 (diff)
downloadgst-plugins-bad-d748422b60f691885b3d25a3555e4fc597615e66.tar.gz
gst-plugins-bad-d748422b60f691885b3d25a3555e4fc597615e66.tar.bz2
gst-plugins-bad-d748422b60f691885b3d25a3555e4fc597615e66.zip
gst/qtdemux/qtdemux.c: Fix wrong memcpy source pointer.
Original commit message from CVS: * gst/qtdemux/qtdemux.c: (qtdemux_parse_trak): Fix wrong memcpy source pointer.
Diffstat (limited to 'gst')
-rw-r--r--gst/qtdemux/qtdemux.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c
index dff4453a..9319cec2 100644
--- a/gst/qtdemux/qtdemux.c
+++ b/gst/qtdemux/qtdemux.c
@@ -2001,12 +2001,11 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak)
if (esds) {
gst_qtdemux_handle_esds (qtdemux, stream, esds);
} else {
- if (QTDEMUX_FOURCC_GET (stsd->data + 16 + 4) ==
+ if (QTDEMUX_FOURCC_GET ((char *) stsd->data + 16 + 4) ==
GST_MAKE_FOURCC ('a', 'v', 'c', '1')) {
gint len = QTDEMUX_GUINT32_GET (stsd->data) - 0x66;
guint8 *stsddata = stsd->data + 0x66;
-
/* find avcC */
while (len >= 0x8 &&
QTDEMUX_FOURCC_GET (stsddata + 0x4) !=
@@ -2029,7 +2028,7 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak)
size = len - 0x8;
buf = gst_buffer_new_and_alloc (size);
- memcpy (GST_BUFFER_DATA (buf), (guint8 *) stsd->data + 0x8, size);
+ memcpy (GST_BUFFER_DATA (buf), stsddata + 0x8, size);
gst_caps_set_simple (stream->caps,
"codec_data", GST_TYPE_BUFFER, buf, NULL);
gst_buffer_unref (buf);