summaryrefslogtreecommitdiffstats
path: root/gst
diff options
context:
space:
mode:
authorSebastian Dröge <slomo@circular-chaos.org>2008-10-16 15:21:15 +0000
committerSebastian Dröge <slomo@circular-chaos.org>2008-10-16 15:21:15 +0000
commit5453883e639cd68c036145395996b133dfe0dcf9 (patch)
tree7d36d588a79cca38d19200cc6fba6c8356fc2807 /gst
parente3cf903b81c8789244cc2a2b083e9a71b1dcbea8 (diff)
downloadgst-plugins-bad-5453883e639cd68c036145395996b133dfe0dcf9.tar.gz
gst-plugins-bad-5453883e639cd68c036145395996b133dfe0dcf9.tar.bz2
gst-plugins-bad-5453883e639cd68c036145395996b133dfe0dcf9.zip
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.
Diffstat (limited to 'gst')
-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 a41b03f6..401a0741 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),