gst/flv/gstflvmux.c: Don't set video_codec to the value that actually should go into...

Original commit message from CVS:
* gst/flv/gstflvmux.c: (gst_flv_mux_audio_pad_setcaps),
(gst_flv_mux_write_buffer):
Don't set video_codec to the value that actually should go
into audio codec, otherwise we create invalid files.
Fixes bug #556564.

diff --git a/ChangeLog b/ChangeLog
index d92b17d321842eb447d48197350fd47075ce7234..74443853491a8d3c5303803b57115e47cd355a8e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-10-16  Sebastian Dröge  <slomo@circular-chaos.org>
+
+       * gst/flv/gstflvmux.c: (gst_flv_mux_audio_pad_setcaps),
+       (gst_flv_mux_write_buffer):
+       Don't set video_codec to the value that actually should go
+       into audio codec, otherwise we create invalid files.
+       Fixes bug #556564.
+
 2008-10-16  Jan Schmidt  <jan.schmidt@sun.com>
 
        * tests/check/Makefile.am:

diff --git a/gst/flv/gstflvmux.c b/gst/flv/gstflvmux.c
index a41b03f616dca6d00e028e2816d702138b29331f..401a0741b16e9104415883ff8a08e0461bb42a5f 100644 (file)
--- a/gst/flv/gstflvmux.c
+++ b/gst/flv/gstflvmux.c
@@ -310,9 +310,9 @@ gst_flv_mux_audio_pad_setcaps (GstPad * pad, GstCaps * caps)
     else
       ret = FALSE;
   } else if (strcmp (gst_structure_get_name (s), "audio/x-alaw") == 0) {
-    cpad->video_codec = 7;
+    cpad->audio_codec = 7;
   } else if (strcmp (gst_structure_get_name (s), "audio/x-mulaw") == 0) {
-    cpad->video_codec = 8;
+    cpad->audio_codec = 8;
   } else {
     ret = FALSE;
   }
@@ -536,7 +536,7 @@ next:
       size += GST_BUFFER_SIZE (buffer);
   } else {
     size += 1;
-    if (cpad->video_codec == 10 && !cpad->sent_codec_data)
+    if (cpad->audio_codec == 10 && !cpad->sent_codec_data)
       size += 1 + GST_BUFFER_SIZE (cpad->audio_codec_data);
     else if (cpad->audio_codec == 10)
       size += 1 + GST_BUFFER_SIZE (buffer);
@@ -595,7 +595,7 @@ next:
     data[11] |= (cpad->width << 1) & 0x02;
     data[11] |= (cpad->channels << 0) & 0x01;
 
-    if (cpad->video_codec == 10 && !cpad->sent_codec_data) {
+    if (cpad->audio_codec == 10 && !cpad->sent_codec_data) {
       data[12] = 0;
 
       memcpy (data + 11 + 1 + 1, GST_BUFFER_DATA (cpad->audio_codec_data),