mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-23 00:36:51 +00:00
gst/avi/gstavimux.c: Fix padding...
Original commit message from CVS: * gst/avi/gstavimux.c: (gst_avimux_write_tag): Fix padding...
This commit is contained in:
parent
2b6207564c
commit
5006606231
2 changed files with 11 additions and 3 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
2005-01-19 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
|
||||||
|
|
||||||
|
* gst/avi/gstavimux.c: (gst_avimux_write_tag):
|
||||||
|
Fix padding...
|
||||||
|
|
||||||
2005-01-19 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
|
2005-01-19 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
|
||||||
|
|
||||||
* gst/matroska/ebml-read.c: (gst_ebml_read_buffer):
|
* gst/matroska/ebml-read.c: (gst_ebml_read_buffer):
|
||||||
|
|
|
@ -591,7 +591,7 @@ gst_avimux_write_tag (const GstTagList * list, const gchar * tag, gpointer data)
|
||||||
GST_RIFF_INFO_IARL, GST_TAG_LOCATION}, {
|
GST_RIFF_INFO_IARL, GST_TAG_LOCATION}, {
|
||||||
0, NULL}
|
0, NULL}
|
||||||
};
|
};
|
||||||
gint n, len;
|
gint n, len, plen;
|
||||||
GstBuffer *buf = data;
|
GstBuffer *buf = data;
|
||||||
gchar *str;
|
gchar *str;
|
||||||
|
|
||||||
|
@ -599,12 +599,15 @@ gst_avimux_write_tag (const GstTagList * list, const gchar * tag, gpointer data)
|
||||||
if (!strcmp (rifftags[n].tag, tag) &&
|
if (!strcmp (rifftags[n].tag, tag) &&
|
||||||
gst_tag_list_get_string (list, tag, &str)) {
|
gst_tag_list_get_string (list, tag, &str)) {
|
||||||
len = strlen (str);
|
len = strlen (str);
|
||||||
if (GST_BUFFER_MAXSIZE (buf) >= GST_BUFFER_SIZE (buf) + 8 + len + 1) {
|
plen = len + 1;
|
||||||
|
if (plen & 1)
|
||||||
|
plen++;
|
||||||
|
if (GST_BUFFER_MAXSIZE (buf) >= GST_BUFFER_SIZE (buf) + 8 + plen) {
|
||||||
GST_WRITE_UINT32_LE (GST_BUFFER_DATA (buf), rifftags[n].fcc);
|
GST_WRITE_UINT32_LE (GST_BUFFER_DATA (buf), rifftags[n].fcc);
|
||||||
GST_WRITE_UINT32_LE (GST_BUFFER_DATA (buf) + 4, len + 1);
|
GST_WRITE_UINT32_LE (GST_BUFFER_DATA (buf) + 4, len + 1);
|
||||||
memcpy (GST_BUFFER_DATA (buf) + 8, str, len);
|
memcpy (GST_BUFFER_DATA (buf) + 8, str, len);
|
||||||
GST_BUFFER_DATA (buf)[8 + len] = 0;
|
GST_BUFFER_DATA (buf)[8 + len] = 0;
|
||||||
GST_BUFFER_SIZE (buf) += 8 + len + 1;
|
GST_BUFFER_SIZE (buf) += 8 + plen;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in a new issue