summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@ronald.bitfreak.net>2004-05-01 02:46:38 +0000
committerRonald S. Bultje <rbultje@ronald.bitfreak.net>2004-05-01 02:46:38 +0000
commit5edbe32754b78320d366c56785a8d6cb70c4c051 (patch)
tree9553c88c17eae18fa297f1c95f8ecdc25f8fcff7
parentcdfd00d33e4a37ecc0bdf82616c22d2ef99ab2fe (diff)
gst/matroska/matroska-demux.c: Really detect ac-3 audio.
Original commit message from CVS: * gst/matroska/matroska-demux.c: (gst_matroska_demux_audio_caps): Really detect ac-3 audio. * gst/typefind/gsttypefindfunctions.c: (matroska_type_find): really detect matroska files (off-by-1).
-rw-r--r--ChangeLog7
-rw-r--r--gst/matroska/matroska-demux.c4
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 30b42dc4..619e4bbd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-04-30 Ronald Bultje <rbultje@ronald.bitfreak.net>
+
+ * gst/matroska/matroska-demux.c: (gst_matroska_demux_audio_caps):
+ Really detect ac-3 audio.
+ * gst/typefind/gsttypefindfunctions.c: (matroska_type_find):
+ really detect matroska files (off-by-1).
+
2004-04-30 David Schleef <ds@schleef.org>
* gst/qtdemux/qtdemux.c: (gst_qtdemux_loop_header),
diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c
index a038aade..895b8d22 100644
--- a/gst/matroska/matroska-demux.c
+++ b/gst/matroska/matroska-demux.c
@@ -2375,7 +2375,8 @@ gst_matroska_demux_audio_caps (GstMatroskaTrackAudioContext * audiocontext,
} else {
gst_caps_set_simple (caps, "width", GST_TYPE_INT_RANGE, 32, 64, NULL);
}
- } else if (!strcmp (codec_id, GST_MATROSKA_CODEC_ID_AUDIO_AC3) ||
+ } else if (!strncmp (codec_id, GST_MATROSKA_CODEC_ID_AUDIO_AC3,
+ strlen (GST_MATROSKA_CODEC_ID_AUDIO_AC3)) ||
!strcmp (codec_id, GST_MATROSKA_CODEC_ID_AUDIO_DTS)) {
caps = gst_caps_new_simple ("audio/x-ac3", NULL);
} else if (!strcmp (codec_id, GST_MATROSKA_CODEC_ID_AUDIO_VORBIS)) {
@@ -2427,6 +2428,7 @@ gst_matroska_demux_audio_caps (GstMatroskaTrackAudioContext * audiocontext,
"mpegversion", G_TYPE_INT, mpegversion, NULL);
} else {
GST_WARNING ("Unknown codec '%s', cannot build Caps", codec_id);
+ g_print ("Codec=%s\n", codec_id);
return NULL;
}