summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <slomo@circular-chaos.org>2008-10-16 15:21:15 +0000
committerSebastian Dröge <sebastian.droege@collabora.co.uk>2009-05-12 21:20:56 +0200
commit6c61c0b78dc7f7da1a97dc5c4c18476caadd705b (patch)
tree590d50c66eb84555d5aa0ab2a1ea3556ed2596dc
parent9611ec851d1840bbaffbb3b4ced7bb86cb6e912d (diff)
[MOVED FROM BAD 31/57] gst/flv/gstflvmux.c: Don't set video_codec to the value that actually should go into audio codec, otherwise we create...
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.
-rw-r--r--gst/flv/gstflvmux.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/gst/flv/gstflvmux.c b/gst/flv/gstflvmux.c
index a41b03f61..401a0741b 100644
--- 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),