diff options
| author | Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> | 2008-10-21 12:42:45 +0000 |
|---|---|---|
| committer | Jan Schmidt <thaytan@mad.scientist.com> | 2008-10-21 12:42:45 +0000 |
| commit | 772201830fa4d752a6777200e22bc98bd39e4463 (patch) | |
| tree | 33b4e85b2668886aacf7829d453763ac2d202df0 | |
| parent | 8508561fcc08936cfc3e85f0b68fbdd0f205b494 (diff) | |
| download | gstreamer-plugins-good-772201830fa4d752a6777200e22bc98bd39e4463.tar.gz | |
gst/avi/gstavimux.c: Fix VPRP chunk setup in avimux.
Original commit message from CVS:
* gst/avi/gstavimux.c:
Fix VPRP chunk setup in avimux.
Fixes: #556010
Patch By: Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | gst/avi/gstavimux.c | 9 |
2 files changed, 12 insertions, 4 deletions
@@ -1,5 +1,12 @@ 2008-10-21 Jan Schmidt <jan.schmidt@sun.com> + * gst/avi/gstavimux.c: + Fix VPRP chunk setup in avimux. + Fixes: #556010 + Patch By: Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> + +2008-10-21 Jan Schmidt <jan.schmidt@sun.com> + * gst/videobox/gstvideobox.c: support dynamically changing properties in videobox Fixed: #557085 diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c index ac5b8348d..ad41ed94c 100644 --- a/gst/avi/gstavimux.c +++ b/gst/avi/gstavimux.c @@ -990,6 +990,7 @@ gst_avi_mux_riff_get_avi_header (GstAviMux * avimux) + (g_slist_length (avimux->sinkpads) * (100 + sizeof (gst_riff_strh_full) + sizeof (gst_riff_strf_vids) + sizeof (gst_riff_vprp) + + sizeof (gst_riff_vprp_video_field_desc) * 2 + sizeof (gst_riff_strf_auds) + 2 + ODML_SUPERINDEX_SIZE)); buffer = gst_buffer_new_and_alloc (size); buffdata = GST_BUFFER_DATA (buffer); @@ -1135,8 +1136,8 @@ gst_avi_mux_riff_get_avi_header (GstAviMux * avimux) GST_WRITE_UINT32_LE (buffdata + 32, vidpad->vprp.width); GST_WRITE_UINT32_LE (buffdata + 36, vidpad->vprp.height); GST_WRITE_UINT32_LE (buffdata + 40, vidpad->vprp.fields); - buffdata += codec_size + 44; - highmark += codec_size + 44; + buffdata += 44; + highmark += 44; for (f = 0; f < vidpad->vprp.fields; ++f) { gst_riff_vprp_video_field_desc *fd; @@ -1149,8 +1150,8 @@ gst_avi_mux_riff_get_avi_header (GstAviMux * avimux) GST_WRITE_UINT32_LE (buffdata + 20, fd->valid_bm_y_offset); GST_WRITE_UINT32_LE (buffdata + 24, fd->video_x_t_offset); GST_WRITE_UINT32_LE (buffdata + 28, fd->video_y_start); - buffdata += codec_size + 32; - highmark += codec_size + 32; + buffdata += 32; + highmark += 32; } } } else { |