Index: etc/codecs.conf
===================================================================
RCS file: /cvsroot/mplayer/main/etc/codecs.conf,v
retrieving revision 1.402
diff -u -r1.402 codecs.conf
--- etc/codecs.conf	27 Feb 2005 18:11:17 -0000	1.402
+++ etc/codecs.conf	6 Mar 2005 12:06:25 -0000
@@ -27,6 +27,7 @@
   status working
   format 0x10000001  ; MPEG-1
   format 0x10000002  ; MPEG-2
+  fourcc "DVR "
   driver libmpeg2
 ;  dll "libmpeg2"
   out YV12,I420,IYUV
@@ -48,6 +49,7 @@
   status working
   format 0x10000002  ; MPEG-2
   fourcc mpg2
+  fourcc "DVR "
   driver ffmpeg
   dll "mpeg2video"
   out YV12,I420,IYUV
@@ -73,6 +75,7 @@
   format 0x10000001  ; MPEG-1
   format 0x10000002  ; MPEG-2
   fourcc mpg1,mpg2
+  fourcc "DVR "
   fourcc PIM1        ; Pinnacle hardware-MPEG-1
   driver ffmpeg
   dll "mpegvideo_xvmc"
@@ -2389,6 +2392,12 @@
   driver ffmpeg
   dll "dts"
 
+audiocodec musepack
+  info "MPC/MpegPlus audio codec"
+  status  working
+  fourcc  "MPC "
+  driver libmusepack
+
 audiocodec ffamrnb
   info "AMR Narrowband"
   status working
Index: libmpdemux/asfheader.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/asfheader.c,v
retrieving revision 1.40
diff -u -r1.40 asfheader.c
--- libmpdemux/asfheader.c	25 Dec 2004 11:31:32 -0000	1.40
+++ libmpdemux/asfheader.c	6 Mar 2005 12:06:27 -0000
@@ -238,6 +238,9 @@
         sh_video->bih=calloc((len<sizeof(BITMAPINFOHEADER))?sizeof(BITMAPINFOHEADER):len,1);
         memcpy(sh_video->bih,&buffer[4+4+1+2],len);
 	le2me_BITMAPINFOHEADER(sh_video->bih);
+	if (sh_video->bih->biCompression == mmioFOURCC('D', 'V', 'R', ' '))
+	  mp_msg(MSGT_DEMUXER, MSGL_WARN, "DVR will probably only work with "
+	          "libavformat, try -demuxer 35 if you have problems\n");
         //sh_video->fps=(float)sh_video->video.dwRate/(float)sh_video->video.dwScale;
         //sh_video->frametime=(float)sh_video->video.dwScale/(float)sh_video->video.dwRate;
         if(verbose>=1) print_video_header(sh_video->bih);