Mercurial > mplayer.hg

changeset 14498:6c8fe2938564

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Decode MP3 in rm files
author rtognimp
date Sat, 15 Jan 2005 15:07:24 +0000
parents c8c617d48814
children 735207ba522e
files etc/codecs.conf libmpdemux/demux_real.c
diffstat 2 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/etc/codecs.conf	Sat Jan 15 01:30:31 2005 +0000
+++ b/etc/codecs.conf	Sat Jan 15 15:07:24 2005 +0000
@@ -2235,6 +2235,14 @@
   driver ffmpeg
   dll "mp3"
 
+audiocodec ffmp3adu
+  info "FFmpeg MPEG layer-3 adu audio decoder"
+  comment "integer only"
+  status working
+  format 0x55756461  ; 'a','d','u',0x55 internal MPlayer fourcc
+  driver ffmpeg
+  dll "mp3adu"
+
 audiocodec ffmp2
   info "FFmpeg MPEG layer-1 and layer-2 audio decoder"
   comment "integer only"
--- a/libmpdemux/demux_real.c	Sat Jan 15 01:30:31 2005 +0000
+++ b/libmpdemux/demux_real.c	Sat Jan 15 15:07:24 2005 +0000
@@ -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 {