diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| m--------- | common | 0 | ||||
| -rw-r--r-- | gst/avi/gstavimux.c | 4 |
3 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,9 @@ +2008-05-12 Mark Nauwelaerts <mnauw@users.sf.net> + + * gst/avi/gstavimux.c: (gst_avi_mux_pad_reset): + Do not leave fourcc stream header field empty upon reset. + Fixes #519301. + 2008-05-11 Jan Schmidt <jan.schmidt@sun.com> * docs/plugins/gst-plugins-good-plugins-docs.sgml: diff --git a/common b/common -Subproject dbf8f3aeceb6e57de097951a670cd853b4886ad +Subproject 2d9c09df0fe4ad3f570fea9f649cfc6c4511080 diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c index d846fc1d..c9a75bd9 100644 --- a/gst/avi/gstavimux.c +++ b/gst/avi/gstavimux.c @@ -314,8 +314,6 @@ gst_avi_mux_pad_reset (GstAviPad * avipad, gboolean free) { /* generic part */ memset (&(avipad->hdr), 0, sizeof (gst_riff_strh)); - avipad->hdr.rate = 1; - avipad->hdr.quality = 0xFFFFFFFF; memset (&(avipad->idx[0]), 0, sizeof (avipad->idx)); @@ -329,6 +327,7 @@ gst_avi_mux_pad_reset (GstAviPad * avipad, gboolean free) if (avipad->is_video) { GstAviVideoPad *vidpad = (GstAviVideoPad *) avipad; + avipad->hdr.type = GST_MAKE_FOURCC ('v', 'i', 'd', 's'); if (vidpad->vids_codec_data) { gst_buffer_unref (vidpad->vids_codec_data); vidpad->vids_codec_data = NULL; @@ -338,6 +337,7 @@ gst_avi_mux_pad_reset (GstAviPad * avipad, gboolean free) } else { GstAviAudioPad *audpad = (GstAviAudioPad *) avipad; + avipad->hdr.type = GST_MAKE_FOURCC ('a', 'u', 'd', 's'); if (audpad->auds_codec_data) { gst_buffer_unref (audpad->auds_codec_data); audpad->auds_codec_data = NULL; |