gst/avi/gstavimux.c: Do not leave fourcc stream header field empty upon reset.

Original commit message from CVS:
* gst/avi/gstavimux.c: (gst_avi_mux_pad_reset):
Do not leave fourcc stream header field empty upon reset.
Fixes #519301.

diff --git a/ChangeLog b/ChangeLog
index 1306b233bf664fbbf2cc7accb82dae731e532329..70808f484935be7fab979e010d71e5c5d4c28758 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
index dbf8f3aeceb6e57de097951a670cd853b4886ad8..2d9c09df0fe4ad3f570fea9f649cfc6c4511080d 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit dbf8f3aeceb6e57de097951a670cd853b4886ad8
+Subproject commit 2d9c09df0fe4ad3f570fea9f649cfc6c4511080d

diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c
index d846fc1da40c85ce1f7dd925ce611552b324ab3a..c9a75bd92dadc9d55a14606a649c4be5743b8b07 100644 (file)
--- 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;