summaryrefslogtreecommitdiffstats
path: root/ext/resindvd/resindvdsrc.c
diff options
context:
space:
mode:
authorDave Robillard <dave@drobilla.net>2009-05-31 19:26:30 -0400
committerDave Robillard <dave@drobilla.net>2009-05-31 19:26:30 -0400
commitaf14cf34e69e46bfd6544a420b3fdd7e131aa69a (patch)
tree2bd39ab6ab67995d6e4c69a3e6c6eae2a17f350e /ext/resindvd/resindvdsrc.c
parentbd9a3cbd254714bf71cd87c31d4e5b77f6a96cba (diff)
parentb19dd5920605c0036dacf19591a6feca7a736a50 (diff)
downloadgst-plugins-bad-af14cf34e69e46bfd6544a420b3fdd7e131aa69a.tar.gz
gst-plugins-bad-af14cf34e69e46bfd6544a420b3fdd7e131aa69a.tar.bz2
gst-plugins-bad-af14cf34e69e46bfd6544a420b3fdd7e131aa69a.zip
Merge branch 'fdo' into lv2
Diffstat (limited to 'ext/resindvd/resindvdsrc.c')
-rw-r--r--ext/resindvd/resindvdsrc.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/ext/resindvd/resindvdsrc.c b/ext/resindvd/resindvdsrc.c
index f24e45aa..122f2b67 100644
--- a/ext/resindvd/resindvdsrc.c
+++ b/ext/resindvd/resindvdsrc.c
@@ -1882,7 +1882,7 @@ rsn_dvdsrc_prepare_streamsinfo_event (resinDvdSrc * src)
GST_DEBUG_OBJECT (src, "mapped logical audio %d to MPEG substream %d",
i, phys_id);
-#if 1
+#if 0
/* FIXME: Only output A52 streams for now, until the decoder switching
* is ready */
if (a->audio_format != 0) {
@@ -1891,7 +1891,8 @@ rsn_dvdsrc_prepare_streamsinfo_event (resinDvdSrc * src)
continue;
}
#endif
- have_audio = TRUE;
+ if (a->audio_format == 0)
+ have_audio = TRUE;
GST_DEBUG_OBJECT (src, "Audio stream %d is format %d, substream %d", i,
(int) a->audio_format, phys_id);
@@ -1917,7 +1918,7 @@ rsn_dvdsrc_prepare_streamsinfo_event (resinDvdSrc * src)
}
if (have_audio == FALSE) {
- /* Always create at least one audio stream */
+ /* Always create at least one audio stream of the required type */
gst_structure_set (s, "audio-0-format", G_TYPE_INT, (int) 0,
"audio-0-stream", G_TYPE_INT, (int) 0, NULL);
}