make xine recognize the new windows media formats and a small audio output plugin loader bugfix

CVS patchset: 914
CVS date: 2001/10/30 09:42:26

4 files changed, 23 insertions, 5 deletions

diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c
index 9b307c5fa..ab6c1c970 100644
--- a/src/demuxers/demux_asf.c
+++ b/src/demuxers/demux_asf.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_asf.c,v 1.4 2001/10/25 00:46:58 miguelfreitas Exp $
+ * $Id: demux_asf.c,v 1.5 2001/10/30 09:42:26 guenter Exp $
  *
  * demultiplexer for asf streams
  *
@@ -443,6 +443,14 @@ static void asf_send_video_header (demux_asf_t *this, int stream_id) {
     /* Video in I263 format */
     this->streams[this->num_streams].buf_type     = BUF_VIDEO_I263;
     break;
+  case mmioFOURCC('W','M','V','1'):
+    /* Windows Media Video 7 */
+    this->streams[this->num_streams].buf_type     = BUF_VIDEO_WMV7;
+    break;
+  case mmioFOURCC('W','M','V','2'):
+    /* Windows Media Video 8 */
+    this->streams[this->num_streams].buf_type     = BUF_VIDEO_WMV8;
+    break;
   default:
     printf ("demux_asf: unknown video format %.4s\n",
 	    (char*)&bih->biCompression);
diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c
index 14ce27f6b..b3e8c9996 100644
--- a/src/demuxers/demux_avi.c
+++ b/src/demuxers/demux_avi.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_avi.c,v 1.47 2001/10/25 00:46:58 miguelfreitas Exp $
+ * $Id: demux_avi.c,v 1.48 2001/10/30 09:42:26 guenter Exp $
  *
  * demultiplexer for avi streams
  *
@@ -1066,6 +1066,14 @@ static void demux_avi_start (demux_plugin_t *this_gen,
       /* Video in I263 format */
       this->avi->video_type     = BUF_VIDEO_I263;
       break;
+    case mmioFOURCC('W','M','V','1'):
+      /* Windows Media Video 7 */
+      this->avi->video_type     = BUF_VIDEO_WMV7;
+      break;
+    case mmioFOURCC('W','M','V','2'):
+      /* Windows Media Video 8 */
+      this->avi->video_type     = BUF_VIDEO_WMV8;
+      break;
     default:
       printf ("demux_avi: unknown avi format %.4s\n",
 	      (char*)&this->avi->bih.biCompression);
diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h
index 22c3a86ca..ba2006c12 100644
--- a/src/xine-engine/buffer.h
+++ b/src/xine-engine/buffer.h
@@ -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: buffer.h,v 1.18 2001/10/21 12:09:06 jcdutton Exp $
+ * $Id: buffer.h,v 1.19 2001/10/30 09:42:26 guenter Exp $
  *
  *
  * contents:
@@ -92,6 +92,8 @@ extern "C" {
 #define BUF_VIDEO_RGB		0x02100000
 #define BUF_VIDEO_YUY2		0x02110000
 #define BUF_VIDEO_JPEG		0x02120000
+#define BUF_VIDEO_WMV7		0x02130000
+#define BUF_VIDEO_WMV8		0x02140000
 
 /* audio buffer types:  */
 
diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c
index 4aa820469..c9ba742db 100644
--- a/src/xine-engine/load_plugins.c
+++ b/src/xine-engine/load_plugins.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: load_plugins.c,v 1.51 2001/10/27 16:12:21 miguelfreitas Exp $
+ * $Id: load_plugins.c,v 1.52 2001/10/30 09:42:26 guenter Exp $
  *
  *
  * Load input/demux/audio_out/video_out/codec plugins
@@ -836,7 +836,7 @@ ao_driver_t *xine_load_audio_output_plugin(config_values_t *config,
 	if(!(plugin = dlopen (str, RTLD_LAZY | RTLD_GLOBAL))) {
 	  printf("load_plugins: audio output plugin %s failed to link: %s\n",
 		 str, dlerror());
-	  return NULL;
+	  /* return NULL; */
 	} else {
 	  void *(*initplug) (config_values_t *);
 	  ao_info_t* (*getinfo) ();