projects
/
platform
/
upstream
/
gst-plugins-good.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d65490d
)
matroskamux: fix regression causing malformed files
author
René Stadler
<rene.stadler@collabora.co.uk>
Mon, 7 Nov 2011 11:00:12 +0000
(12:00 +0100)
committer
René Stadler
<rene.stadler@collabora.co.uk>
Mon, 7 Nov 2011 11:00:12 +0000
(12:00 +0100)
This was caused by me in 1b213d. It seems I was too focused on 0.11 when I did
this and tested the wrong branch.
The problem was reported by Alexey Fisher.
gst/matroska/ebml-write.c
patch
|
blob
|
history
diff --git
a/gst/matroska/ebml-write.c
b/gst/matroska/ebml-write.c
index
9bc88ea
..
06f3568
100644
(file)
--- a/
gst/matroska/ebml-write.c
+++ b/
gst/matroska/ebml-write.c
@@
-411,10
+411,12
@@
gst_ebml_write_element_push (GstEbmlWrite * ebml, GstBuffer * buf,
if (!buf_data)
buf_data = GST_BUFFER_DATA (buf);
- if (buf_data_end)
+ if (buf_data_end)
{
data_size = buf_data_end - buf_data;
- else
+ GST_BUFFER_SIZE (buf) = data_size;
+ } else {
data_size = GST_BUFFER_SIZE (buf);
+ }
ebml->pos += data_size;