summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/demuxers/demux_aiff.c4
-rw-r--r--src/demuxers/demux_cda.c4
-rw-r--r--src/demuxers/demux_fli.c4
-rw-r--r--src/demuxers/demux_idcin.c5
-rw-r--r--src/demuxers/demux_roq.c5
-rw-r--r--src/demuxers/demux_smjpeg.c5
-rw-r--r--src/demuxers/demux_snd.c4
-rw-r--r--src/demuxers/demux_voc.c4
-rw-r--r--src/demuxers/demux_vqa.c5
-rw-r--r--src/demuxers/demux_wav.c4
-rw-r--r--src/demuxers/demux_wc3movie.c6
-rw-r--r--src/demuxers/demux_yuv4mpeg2.c4
12 files changed, 42 insertions, 12 deletions
diff --git a/src/demuxers/demux_aiff.c b/src/demuxers/demux_aiff.c
index 517d1c086..e1881e437 100644
--- a/src/demuxers/demux_aiff.c
+++ b/src/demuxers/demux_aiff.c
@@ -19,7 +19,7 @@
*
* AIFF File Demuxer by Mike Melanson (melanson@pcisys.net)
*
- * $Id: demux_aiff.c,v 1.12 2002/10/26 21:27:35 tmmm Exp $
+ * $Id: demux_aiff.c,v 1.13 2002/10/27 16:14:22 tmmm Exp $
*
*/
@@ -293,6 +293,8 @@ static void demux_aiff_send_headers(demux_plugin_t *this_gen) {
this->status = DEMUX_OK;
/* load stream information */
+ this->stream->stream_info[XINE_STREAM_INFO_HAS_VIDEO] = 0;
+ this->stream->stream_info[XINE_STREAM_INFO_HAS_AUDIO] = 1;
this->stream->stream_info[XINE_STREAM_INFO_AUDIO_CHANNELS] =
this->audio_channels;
this->stream->stream_info[XINE_STREAM_INFO_AUDIO_SAMPLERATE] =
diff --git a/src/demuxers/demux_cda.c b/src/demuxers/demux_cda.c
index 08d819fac..35c28fe21 100644
--- a/src/demuxers/demux_cda.c
+++ b/src/demuxers/demux_cda.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: demux_cda.c,v 1.28 2002/10/27 02:40:00 tmmm Exp $
+ * $Id: demux_cda.c,v 1.29 2002/10/27 16:14:22 tmmm Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -236,6 +236,8 @@ static void demux_cda_send_headers(demux_plugin_t *this_gen) {
this->status = DEMUX_OK;
/* hardwired stream information */
+ this->stream->stream_info[XINE_STREAM_INFO_HAS_VIDEO] = 0;
+ this->stream->stream_info[XINE_STREAM_INFO_HAS_AUDIO] = 1;
this->stream->stream_info[XINE_STREAM_INFO_AUDIO_CHANNELS] = 2;
this->stream->stream_info[XINE_STREAM_INFO_AUDIO_SAMPLERATE] = 44100;
this->stream->stream_info[XINE_STREAM_INFO_AUDIO_BITS] = 16;
diff --git a/src/demuxers/demux_fli.c b/src/demuxers/demux_fli.c
index 8a38a7b90..4a8427721 100644
--- a/src/demuxers/demux_fli.c
+++ b/src/demuxers/demux_fli.c
@@ -22,7 +22,7 @@
* avoid while programming a FLI decoder, visit:
* http://www.pcisys.net/~melanson/codecs/
*
- * $Id: demux_fli.c,v 1.21 2002/10/27 15:51:53 tmmm Exp $
+ * $Id: demux_fli.c,v 1.22 2002/10/27 16:14:23 tmmm Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -253,6 +253,8 @@ static void demux_fli_send_headers(demux_plugin_t *this_gen) {
this->status = DEMUX_OK;
/* load stream information */
+ this->stream->stream_info[XINE_STREAM_INFO_HAS_VIDEO] = 1;
+ this->stream->stream_info[XINE_STREAM_INFO_HAS_AUDIO] = 0;
this->stream->stream_info[XINE_STREAM_INFO_VIDEO_WIDTH] = this->width;
this->stream->stream_info[XINE_STREAM_INFO_VIDEO_HEIGHT] = this->height;
diff --git a/src/demuxers/demux_idcin.c b/src/demuxers/demux_idcin.c
index 257da4ae1..76563f885 100644
--- a/src/demuxers/demux_idcin.c
+++ b/src/demuxers/demux_idcin.c
@@ -63,7 +63,7 @@
* - if any bytes exceed 63, do not shift the bytes at all before
* transmitting them to the video decoder
*
- * $Id: demux_idcin.c,v 1.21 2002/10/27 15:51:53 tmmm Exp $
+ * $Id: demux_idcin.c,v 1.22 2002/10/27 16:14:26 tmmm Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -344,6 +344,9 @@ static int open_idcin_file(demux_idcin_t *this) {
return 0;
/* load stream information */
+ this->stream->stream_info[XINE_STREAM_INFO_HAS_VIDEO] = 1;
+ this->stream->stream_info[XINE_STREAM_INFO_HAS_AUDIO] =
+ (this->audio_channels) ? 1 : 0;
this->stream->stream_info[XINE_STREAM_INFO_VIDEO_WIDTH] =
this->video_width;
this->stream->stream_info[XINE_STREAM_INFO_VIDEO_HEIGHT] =
diff --git a/src/demuxers/demux_roq.c b/src/demuxers/demux_roq.c
index 57e18c012..381da363d 100644
--- a/src/demuxers/demux_roq.c
+++ b/src/demuxers/demux_roq.c
@@ -21,7 +21,7 @@
* For more information regarding the RoQ file format, visit:
* http://www.csse.monash.edu.au/~timf/
*
- * $Id: demux_roq.c,v 1.24 2002/10/26 22:00:54 guenter Exp $
+ * $Id: demux_roq.c,v 1.25 2002/10/27 16:14:28 tmmm Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -353,6 +353,9 @@ static void demux_roq_send_headers(demux_plugin_t *this_gen) {
this->status = DEMUX_OK;
/* load stream information */
+ this->stream->stream_info[XINE_STREAM_INFO_HAS_VIDEO] = 1;
+ this->stream->stream_info[XINE_STREAM_INFO_HAS_AUDIO] =
+ (this->audio_channels) ? 1 : 0;
this->stream->stream_info[XINE_STREAM_INFO_VIDEO_WIDTH] = this->width;
this->stream->stream_info[XINE_STREAM_INFO_VIDEO_HEIGHT] = this->height;
this->stream->stream_info[XINE_STREAM_INFO_AUDIO_CHANNELS] =
diff --git a/src/demuxers/demux_smjpeg.c b/src/demuxers/demux_smjpeg.c
index 04e2bfeca..145e210bf 100644
--- a/src/demuxers/demux_smjpeg.c
+++ b/src/demuxers/demux_smjpeg.c
@@ -21,7 +21,7 @@
* For more information on the SMJPEG file format, visit:
* http://www.lokigames.com/development/smjpeg.php3
*
- * $Id: demux_smjpeg.c,v 1.21 2002/10/27 15:51:53 tmmm Exp $
+ * $Id: demux_smjpeg.c,v 1.22 2002/10/27 16:14:28 tmmm Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -372,6 +372,9 @@ static void demux_smjpeg_send_headers(demux_plugin_t *this_gen) {
this->status = DEMUX_OK;
/* load stream information */
+ this->stream->stream_info[XINE_STREAM_INFO_HAS_VIDEO] = 1;
+ this->stream->stream_info[XINE_STREAM_INFO_HAS_AUDIO] =
+ (this->audio_channels) ? 1 : 0;
this->stream->stream_info[XINE_STREAM_INFO_VIDEO_WIDTH] = this->bih.biWidth;
this->stream->stream_info[XINE_STREAM_INFO_VIDEO_HEIGHT] = this->bih.biHeight;
this->stream->stream_info[XINE_STREAM_INFO_AUDIO_CHANNELS] =
diff --git a/src/demuxers/demux_snd.c b/src/demuxers/demux_snd.c
index 679c4ca01..bc4bdf2dc 100644
--- a/src/demuxers/demux_snd.c
+++ b/src/demuxers/demux_snd.c
@@ -19,7 +19,7 @@
*
* SND/AU File Demuxer by Mike Melanson (melanson@pcisys.net)
*
- * $Id: demux_snd.c,v 1.13 2002/10/26 22:03:58 tmmm Exp $
+ * $Id: demux_snd.c,v 1.14 2002/10/27 16:14:29 tmmm Exp $
*
*/
@@ -275,6 +275,8 @@ static void demux_snd_send_headers(demux_plugin_t *this_gen) {
this->status = DEMUX_OK;
/* load stream information */
+ this->stream->stream_info[XINE_STREAM_INFO_HAS_VIDEO] = 0;
+ this->stream->stream_info[XINE_STREAM_INFO_HAS_AUDIO] = 1;
this->stream->stream_info[XINE_STREAM_INFO_AUDIO_CHANNELS] =
this->audio_channels;
this->stream->stream_info[XINE_STREAM_INFO_AUDIO_SAMPLERATE] =
diff --git a/src/demuxers/demux_voc.c b/src/demuxers/demux_voc.c
index f7c729219..e87c63d50 100644
--- a/src/demuxers/demux_voc.c
+++ b/src/demuxers/demux_voc.c
@@ -23,7 +23,7 @@
* It will only play that block if it is PCM data. More variations will be
* supported as they are encountered.
*
- * $Id: demux_voc.c,v 1.13 2002/10/26 21:49:58 tmmm Exp $
+ * $Id: demux_voc.c,v 1.14 2002/10/27 16:14:29 tmmm Exp $
*
*/
@@ -268,6 +268,8 @@ static void demux_voc_send_headers(demux_plugin_t *this_gen) {
this->status = DEMUX_OK;
/* load stream information */
+ this->stream->stream_info[XINE_STREAM_INFO_HAS_VIDEO] = 0;
+ this->stream->stream_info[XINE_STREAM_INFO_HAS_AUDIO] = 1;
this->stream->stream_info[XINE_STREAM_INFO_AUDIO_CHANNELS] =
this->audio_channels;
this->stream->stream_info[XINE_STREAM_INFO_AUDIO_SAMPLERATE] =
diff --git a/src/demuxers/demux_vqa.c b/src/demuxers/demux_vqa.c
index 533ac7616..2239b0090 100644
--- a/src/demuxers/demux_vqa.c
+++ b/src/demuxers/demux_vqa.c
@@ -27,7 +27,7 @@
* block needs information from the previous audio block in order to be
* decoded, thus making random seeking difficult.
*
- * $Id: demux_vqa.c,v 1.14 2002/10/27 02:20:35 tmmm Exp $
+ * $Id: demux_vqa.c,v 1.15 2002/10/27 16:14:30 tmmm Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -311,6 +311,9 @@ static void demux_vqa_send_headers(demux_plugin_t *this_gen) {
this->status = DEMUX_OK;
/* load stream information */
+ this->stream->stream_info[XINE_STREAM_INFO_HAS_VIDEO] = 1;
+ this->stream->stream_info[XINE_STREAM_INFO_HAS_AUDIO] =
+ (this->audio_channels) ? 1 : 0;
this->stream->stream_info[XINE_STREAM_INFO_VIDEO_WIDTH] = this->video_width;
this->stream->stream_info[XINE_STREAM_INFO_VIDEO_HEIGHT] = this->video_height;
this->stream->stream_info[XINE_STREAM_INFO_AUDIO_CHANNELS] =
diff --git a/src/demuxers/demux_wav.c b/src/demuxers/demux_wav.c
index 95916710c..04251c1fb 100644
--- a/src/demuxers/demux_wav.c
+++ b/src/demuxers/demux_wav.c
@@ -20,7 +20,7 @@
* MS WAV File Demuxer by Mike Melanson (melanson@pcisys.net)
* based on WAV specs that are available far and wide
*
- * $Id: demux_wav.c,v 1.21 2002/10/26 22:00:55 guenter Exp $
+ * $Id: demux_wav.c,v 1.22 2002/10/27 16:14:30 tmmm Exp $
*
*/
@@ -260,6 +260,8 @@ static void demux_wav_send_headers(demux_plugin_t *this_gen) {
this->status = DEMUX_OK;
/* load stream information */
+ this->stream->stream_info[XINE_STREAM_INFO_HAS_VIDEO] = 0;
+ this->stream->stream_info[XINE_STREAM_INFO_HAS_AUDIO] = 1;
this->stream->stream_info[XINE_STREAM_INFO_AUDIO_CHANNELS] =
this->wave->nChannels;
this->stream->stream_info[XINE_STREAM_INFO_AUDIO_SAMPLERATE] =
diff --git a/src/demuxers/demux_wc3movie.c b/src/demuxers/demux_wc3movie.c
index 2d38bbb13..8c1ec6b24 100644
--- a/src/demuxers/demux_wc3movie.c
+++ b/src/demuxers/demux_wc3movie.c
@@ -22,7 +22,7 @@
* For more information on the MVE file format, visit:
* http://www.pcisys.net/~melanson/codecs/
*
- * $Id: demux_wc3movie.c,v 1.19 2002/10/26 22:00:55 guenter Exp $
+ * $Id: demux_wc3movie.c,v 1.20 2002/10/27 16:14:31 tmmm Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -365,6 +365,10 @@ static void demux_mve_send_headers(demux_plugin_t *this_gen) {
this->status = DEMUX_OK;
/* load stream information */
+ this->stream->stream_info[XINE_STREAM_INFO_HAS_VIDEO] = 1;
+ /* this is not strictly correct-- some WC3 MVE files do not contain
+ * audio, but I'm too lazy to check if that is the case */
+ this->stream->stream_info[XINE_STREAM_INFO_HAS_AUDIO] = 1;
this->stream->stream_info[XINE_STREAM_INFO_VIDEO_WIDTH] = this->video_width;
this->stream->stream_info[XINE_STREAM_INFO_VIDEO_HEIGHT] = this->video_height;
this->stream->stream_info[XINE_STREAM_INFO_AUDIO_CHANNELS] =
diff --git a/src/demuxers/demux_yuv4mpeg2.c b/src/demuxers/demux_yuv4mpeg2.c
index 81d829be3..cf6345806 100644
--- a/src/demuxers/demux_yuv4mpeg2.c
+++ b/src/demuxers/demux_yuv4mpeg2.c
@@ -22,7 +22,7 @@
* tools, visit:
* http://mjpeg.sourceforge.net/
*
- * $Id: demux_yuv4mpeg2.c,v 1.6 2002/10/26 22:59:20 tmmm Exp $
+ * $Id: demux_yuv4mpeg2.c,v 1.7 2002/10/27 16:14:31 tmmm Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -281,6 +281,8 @@ static void demux_yuv4mpeg2_send_headers(demux_plugin_t *this_gen) {
this->status = DEMUX_OK;
/* load stream information */
+ this->stream->stream_info[XINE_STREAM_INFO_HAS_VIDEO] = 1;
+ this->stream->stream_info[XINE_STREAM_INFO_HAS_AUDIO] = 0;
this->stream->stream_info[XINE_STREAM_INFO_VIDEO_WIDTH] = this->bih.biWidth;
this->stream->stream_info[XINE_STREAM_INFO_VIDEO_HEIGHT] = this->bih.biHeight;