summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--gst/matroska/matroska-mux.c6
2 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d04f64d3..12c053a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-12-06 Arwed v. Merkatz <v.merkatz@gmx.net>
+
+ * gst/mpegaudioparse/gstmpegaudioparse.c: (gst_mp3parse_chain):
+ set BUFFER_DURATION to correct values (mpeg1 audio frame length is fixed)
+ * gst/matroska/matroska-mux.c: (gst_matroska_mux_audio_pad_link):
+ set default_duration for mpeg1 audio
+
2004-12-06 Benjamin Otte <in7y118@public.uni-hamburg.de>
* ext/alsa/gstalsa.c: (gst_alsa_get_caps), (gst_alsa_close_audio):
diff --git a/gst/matroska/matroska-mux.c b/gst/matroska/matroska-mux.c
index 2aded266..0a9ff29c 100644
--- a/gst/matroska/matroska-mux.c
+++ b/gst/matroska/matroska-mux.c
@@ -526,12 +526,18 @@ gst_matroska_mux_audio_pad_link (GstPad * pad, const GstCaps * caps)
switch (layer) {
case 1:
context->codec_id = g_strdup (GST_MATROSKA_CODEC_ID_AUDIO_MPEG1_L1);
+ context->default_duration =
+ 384 * GST_SECOND / audiocontext->samplerate;
break;
case 2:
context->codec_id = g_strdup (GST_MATROSKA_CODEC_ID_AUDIO_MPEG1_L2);
+ context->default_duration =
+ 1152 * GST_SECOND / audiocontext->samplerate;
break;
case 3:
context->codec_id = g_strdup (GST_MATROSKA_CODEC_ID_AUDIO_MPEG1_L3);
+ context->default_duration =
+ 1152 * GST_SECOND / audiocontext->samplerate;
break;
}
break;