diff options
author | Dave Robillard <dave@drobilla.net> | 2009-05-31 19:25:34 -0400 |
---|---|---|
committer | Dave Robillard <dave@drobilla.net> | 2009-05-31 19:25:34 -0400 |
commit | b19dd5920605c0036dacf19591a6feca7a736a50 (patch) | |
tree | d33824039c10756da4d306051165d6bbe707345a /ext/resindvd/resindvdsrc.c | |
parent | b75a26657febaf86c4137b4d41c068926325e316 (diff) | |
parent | 7c5ff224fcb10b82d6e591677d556143569e2844 (diff) | |
download | gst-plugins-bad-b19dd5920605c0036dacf19591a6feca7a736a50.tar.gz gst-plugins-bad-b19dd5920605c0036dacf19591a6feca7a736a50.tar.bz2 gst-plugins-bad-b19dd5920605c0036dacf19591a6feca7a736a50.zip |
Merge branch 'master' of git://anongit.freedesktop.org/gstreamer/gst-plugins-bad into fdo
Diffstat (limited to 'ext/resindvd/resindvdsrc.c')
-rw-r--r-- | ext/resindvd/resindvdsrc.c | 7 |
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); } |