[MPlayer-cvslog] CVS: main/libmpdemux demux_real.c,1.65,1.66

Roberto Togni CVS syncmail at mplayerhq.hu
Sat Jan 15 16:07:27 CET 2005


CVS change done by Roberto Togni CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv18869/libmpdemux

Modified Files:
	demux_real.c 
Log Message:
Decode MP3 in rm files


Index: demux_real.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_real.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- demux_real.c	6 Jan 2005 17:08:52 -0000	1.65
+++ demux_real.c	15 Jan 2005 15:07:24 -0000	1.66
@@ -1400,8 +1400,7 @@
 #undef stream_skip
 #endif
 		}
-#if 0
-	  } else if (strstr(mimet,"X-MP3")) {
+	  } else if (strstr(mimet,"X-MP3-draft-00")) {
 		    sh_audio_t *sh = new_sh_audio(demuxer, stream_id);
 
 		    /* Emulate WAVEFORMATEX struct: */
@@ -1413,7 +1412,7 @@
 		    sh->wf->nAvgBytesPerSec = 0;//bitrate;
 		    sh->wf->nBlockAlign = 0;//frame_size;
 		    sh->wf->cbSize = 0;
-		    sh->wf->wFormatTag = sh->format = 0x55;
+		    sh->wf->wFormatTag = sh->format = mmioFOURCC('a','d','u',0x55);
 		    
 		    if(demuxer->audio->id==stream_id){
 			    sh->ds=demuxer->audio;
@@ -1421,7 +1420,6 @@
 		    }
 		    
 		    ++a_streams;
-#endif
 	  } else if (strstr(mimet,"x-ralf-mpeg4")) {
 		 mp_msg(MSGT_DEMUX,MSGL_ERR,"Real lossless audio not supported yet\n");
 	  } else {




More information about the MPlayer-cvslog mailing list