summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--gst/qtdemux/qtdemux.c24
2 files changed, 13 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog
index 2382f2e5..965d162b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-03 Jan Schmidt <thaytan@mad.scientist.com>
+
+ * gst/qtdemux/qtdemux.c: (qtdemux_parse_trak):
+ Clean up one piece of logic slightly and remove a
+ dead code block.
+
2006-05-03 Tim-Philipp Müller <tim at centricular dot net>
* docs/plugins/Makefile.am:
diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c
index 83b49243..81cde549 100644
--- a/gst/qtdemux/qtdemux.c
+++ b/gst/qtdemux/qtdemux.c
@@ -3229,27 +3229,17 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak)
mp4a = qtdemux_tree_get_child_by_type (stsd, FOURCC_mp4a);
wave = NULL;
- if (mp4a)
- wave = qtdemux_tree_get_child_by_type (mp4a, FOURCC_wave);
-
esds = NULL;
- if (wave)
- esds = qtdemux_tree_get_child_by_type (wave, FOURCC_esds);
- else if (mp4a)
- esds = qtdemux_tree_get_child_by_type (mp4a, FOURCC_esds);
+ if (mp4a) {
+ wave = qtdemux_tree_get_child_by_type (mp4a, FOURCC_wave);
+ if (wave)
+ esds = qtdemux_tree_get_child_by_type (wave, FOURCC_esds);
+ if (!esds)
+ esds = qtdemux_tree_get_child_by_type (mp4a, FOURCC_esds);
+ }
if (esds) {
gst_qtdemux_handle_esds (qtdemux, stream, esds);
-#if 0
- GstBuffer *buffer;
- int len = QTDEMUX_GUINT32_GET (esds->data);
-
- buffer = gst_buffer_new_and_alloc (len - 8);
- memcpy (GST_BUFFER_DATA (buffer), esds->data + 8, len - 8);
-
- gst_caps_set_simple (stream->caps, "codec_data",
- GST_TYPE_BUFFER, buffer, NULL);
-#endif
} else {
if (QTDEMUX_FOURCC_GET (stsd->data + 16 + 4) ==
GST_MAKE_FOURCC ('Q', 'D', 'M', '2')) {