diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | gst/avi/gstavimux.c | 9 |
2 files changed, 11 insertions, 3 deletions
@@ -1,5 +1,10 @@ 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> + * gst/matroska/ebml-read.c: (gst_ebml_read_buffer): Allow for 0-sized buffers. Fixes length query problems in starwars.mkv from the testsuite. diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c index 778f8c29..110f6bfb 100644 --- a/gst/avi/gstavimux.c +++ b/gst/avi/gstavimux.c @@ -591,7 +591,7 @@ gst_avimux_write_tag (const GstTagList * list, const gchar * tag, gpointer data) GST_RIFF_INFO_IARL, GST_TAG_LOCATION}, { 0, NULL} }; - gint n, len; + gint n, len, plen; GstBuffer *buf = data; gchar *str; @@ -599,12 +599,15 @@ gst_avimux_write_tag (const GstTagList * list, const gchar * tag, gpointer data) if (!strcmp (rifftags[n].tag, tag) && gst_tag_list_get_string (list, tag, &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) + 4, len + 1); memcpy (GST_BUFFER_DATA (buf) + 8, str, len); GST_BUFFER_DATA (buf)[8 + len] = 0; - GST_BUFFER_SIZE (buf) += 8 + len + 1; + GST_BUFFER_SIZE (buf) += 8 + plen; } } break; |